Changeset 3594


Ignore:
Timestamp:
Oct 2, 2007, 11:35:22 PM (18 years ago)
Author:
bird
Message:

Made it build on darwin - leaving a couple of things for later...

Location:
trunk/kStuff/kHlp
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/kStuff/kHlp/Bare/kHlpBare-gcc.c

    r3573 r3594  
    142142        KUPTR   u = ch | (ch << 8);
    143143        u |= u << 16;
    144 #if defined(__AMD64__)
     144#if
    145145        u |= u << 32;
     146
     147
     148
    146149#endif
    147150

  • trunk/kStuff/kHlp/Bare/kHlpBareAssert.c

    r3582 r3594  
    3131#include <k/kHlpString.h>
    3232
    33 #if K_OS == K_OS_OS2
     33#if K_OS == K_OS_DARWIN
     34extern kHlpSys_write(int fd, const void *buf, KSIZE);
     35
     36#elif K_OS == K_OS_OS2
    3437# define INCL_BASE
    3538# define INCL_ERRORS
    … …  
    5154static void kHlpAssertWrite(const char *pszMsg)
    5255{
    53 #if K_OS == K_OS_OS2 ||  K_OS == K_OS_WINDOWS
     56#if K_OS == K_OS_DARWIN
     57    KSIZE cchMsg = kHlpStrLen(pszMsg);
     58    kHlpSys_write(2 /* stderr */, pszMsg, cchMsg);
     59
     60#elif K_OS == K_OS_OS2 ||  K_OS == K_OS_WINDOWS
    5461    /*
    5562     * Line by line.

  • trunk/kStuff/kHlp/Bare/kHlpBareEnv.c

    r3575 r3594  
    3232#include <k/kErrors.h>
    3333
    34 #if K_OS == K_OS_OS2
     34#if K_OS == K_OS_DARWIN
     35
     36#elif K_OS == K_OS_OS2
    3537# define INCL_BASE
    3638# define INCL_ERRORS
    3739# include <os2.h>
     40
    3841#elif  K_OS == K_OS_WINDOWS
    3942# include <Windows.h>
     43
    4044#else
    4145# error "port me"
    … …  
    4549KHLP_DECL(int) kHlpGetEnv(const char *pszVar, char *pszVal, KSIZE cchVal)
    4650{
    47 #if K_OS == K_OS_OS2
     51#if K_OS == K_OS_DARWIN
     52    /** @todo need to figure out where the stuff is or how it's inherited on darwin ... */
     53    return KERR_ENVVAR_NOT_FOUND;
     54
     55#elif K_OS == K_OS_OS2
    4856    PSZ pszValue = NULL;
    4957    int rc;

  • trunk/kStuff/kHlp/Bare/kHlpBareHeap.c

    r3578 r3594  
    3838# define INCL_ERRORS
    3939# include <os2.h>
     40
    4041#elif  K_OS == K_OS_WINDOWS
    4142# include <Windows.h>
     43
    4244#else
    43 # error "port me"
     45#
    4446#endif
    4547
    … …  
    716718
    717719#else
    718 # error "Port me"
     720    int rc;
     721
     722    pSeg->cb = (cbMin + 0xffff) & ~(KSIZE)0xffff;
     723    pSeg->pvBase = NULL;
     724    rc = kHlpPageAlloc(&pSeg->pvBase, pSeg->cb, KPROT_READWRITE, K_FALSE);
     725    if (rc)
     726    {
     727        pSeg->pvBase = NULL;
     728        pSeg->cb = 0;
     729        return rc;
     730    }
     731
    719732#endif
    720733
    … …  
    739752
    740753#else
    741 # error "Port me"
     754    int rc = kHlpPageFree(pSeg->pvBase, pSeg->cb);
     755    KHLPHEAP_ASSERT(!rc); (void)rc;
     756
    742757#endif
    743758}

  • trunk/kStuff/kHlp/Bare/kHlpBareProcess.c

    r3573 r3594  
    3131#include <k/kHlpAssert.h>
    3232
    33 #if K_OS == K_OS_OS2
     33#if K_OS == K_OS_DARWIN
     34extern void kHlpSys_exit(int rc);
     35
     36#elif K_OS == K_OS_OS2
    3437# define INCL_BASE
    3538# define INCL_ERRORS
    … …  
    5154    for (;;)
    5255    {
    53 #if K_OS == K_OS_OS2
     56#if K_OS == K_OS_DARWIN
     57        kHlpSys_exit(rc);
     58
     59#elif K_OS == K_OS_OS2
    5460        DosExit(EXIT_PROCESS, rc);
    5561

  • trunk/kStuff/kHlp/Bare/kHlpBareThread.c

    r3573 r3594  
    3030#include <k/kHlpThread.h>
    3131
    32 #if K_OS == K_OS_OS2
     32#if K_OS == K_OS_DARWIN
     33
     34#elif K_OS == K_OS_OS2
    3335# define INCL_BASE
    3436# define INCL_ERRORS
    …