Changeset 3834


Ignore:
Timestamp:
Mar 15, 2014, 10:12:04 PM (11 years ago)
Author:
bird
Message:

os2emx.h: Include os2safe.h by default unless NO_INCL_SAFE_HIMEM_WRAPPERS is defined. Fixes #280.

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/libc-0.6/src/emx/include/os2emx.h

    r2519 r3834  
    152152#if defined (INCL_CIRCULARSLIDER) && !defined (INCL_WINCIRCULARSLIDER)
    153153#define INCL_WINCIRCULARSLIDER
     154#endif
     155
     156#ifndef NO_INCL_SAFE_HIMEM_WRAPPERS
     157# include <os2safe.h>
    154158#endif
    155159

  • branches/libc-0.6/src/emx/src/libos2/os2.smak

    r1564 r3834  
    1010.TSRC.386 := $(wildcard src/libos2/*.s)
    1111.TSRC   := $(.TSRC.$(CPU)) $(wildcard src/libos2/*.c) $(wildcard src/libos2/safe/*.c)
    12 .TCF    := -Wno-unused -s
     12.TCF    := -Wno-unused -s -DNO_INCL_SAFE_HIMEM_WRAPPERS
    1313.IMPS   := $(wildcard src/libos2/*.imp)
    1414.TKEEP  := 1

  • trunk/libc/Config.kmk

    r3826 r3834  
    8484TEMPLATE_libc_DEPS = $(LIBC-STD.H)
    8585TEMPLATE_libc_INST = usr/lib/
     86TEMPLATE_libc_DEFS.os2 = NO_INCL_SAFE_HIMEM_WRAPPERS
    8687TEMPLATE_libc_INCS = $(PATH_LIBC_INC) $(dir $(LIBC-STD.H))
    8788TEMPLATE_libc_INCS.nt = $(PATH_LIBC_SRC)/w32api/include

  • trunk/libc/include/os2emx.h

    r3825 r3834  
    152152#if defined (INCL_CIRCULARSLIDER) && !defined (INCL_WINCIRCULARSLIDER)
    153153#define INCL_WINCIRCULARSLIDER
     154#endif
     155
     156#ifndef NO_INCL_SAFE_HIMEM_WRAPPERS
     157# include <os2safe.h>
    154158#endif
    155159

  • trunk/libc/src/libos2/Makefile.kmk

    r2939 r3834  
    3636LIBRARIES += libos2
    3737libos2_TEMPLATE = libc
     38libos2_DEFS = NO_INCL_SAFE_HIMEM_WRAPPERS
    3839libos2_SOURCES := \
    3940        $(wildcard $(PATH_LIBC_SRC)/libos2/*.c) \
Note: See TracChangeset for help on using the changeset viewer.