Changeset 236 for trunk/src/emx/include/os2thunk.h

Timestamp:

May 26, 2003, 4:43:12 PM (22 years ago)

Author:

zap

Message:

See ChangeLog.

File:

• trunk/src/emx/include/os2thunk.h (modified) (4 diffs, 1 prop)

trunk/src/emx/include/os2thunk.h

@@ -6 +6 @@
 typedef unsigned long _far16ptr;
 
-_far16ptr _emx_32to16 (void *ptr);
-void *_emx_16to32 (_far16ptr ptr);
+_far16ptr _libc_32to16 (void *ptr);
+void *_libc_16to32 (_far16ptr ptr);
 
-unsigned long _emx_thunk1 (void *args, void *fun);
+unsigned long _libc_thunk1 (void *args, void *fun);
 
 #define _THUNK_PASCAL_PROLOG(SIZE) \
@@ -17 +17 @@
 #define _THUNK_PASCAL_SHORT(ARG)    (*--((unsigned short *)_tp) = (ARG))
 #define _THUNK_PASCAL_LONG(ARG)     (*--((unsigned long *)_tp) = (ARG))
-#define _THUNK_PASCAL_FLAT(ARG)     _THUNK_PASCAL_LONG (_emx_32to16 (ARG))
+#define _THUNK_PASCAL_FLAT(ARG)     _THUNK_PASCAL_LONG (_libc_32to16 (ARG))
 #define _THUNK_PASCAL_FAR16(ARG)    _THUNK_PASCAL_LONG (ARG)
 #define _THUNK_PASCAL_FUNCTION(FUN) APIENTRY _16_##FUN
-#define _THUNK_PASCAL_CALL(FUN)     _emx_thunk1 (_tb, (void *)(_16_##FUN)); })
-#define _THUNK_PASCAL_CALLI(FUN)    _emx_thunk1 (_tb, (void *)(FUN)); })
+#define _THUNK_PASCAL_CALL(FUN)     _libc_thunk1 (_tb, (void *)(_16_##FUN)); })
+#define _THUNK_PASCAL_CALLI(FUN)    _libc_thunk1 (_tb, (void *)(FUN)); })
 
 #define _THUNK_C_PROLOG(SIZE) \
@@ -29 +29 @@
 #define _THUNK_C_SHORT(ARG)    (*((unsigned short *)_tp)++ = (ARG))
 #define _THUNK_C_LONG(ARG)     (*((unsigned long *)_tp)++ = (ARG))
-#define _THUNK_C_FLAT(ARG)     _THUNK_C_LONG (_emx_32to16 (ARG))
+#define _THUNK_C_FLAT(ARG)     _THUNK_C_LONG (_libc_32to16 (ARG))
 #define _THUNK_C_FAR16(ARG)    _THUNK_C_LONG (ARG)
 #define _THUNK_C_FUNCTION(FUN) _16__##FUN
-#define _THUNK_C_CALL(FUN)     _emx_thunk1 (_tb, (void *)(_16__##FUN)); })
-#define _THUNK_C_CALLI(FUN)    _emx_thunk1 (_tb, (void *)(FUN)); })
+#define _THUNK_C_CALL(FUN)     _libc_thunk1 (_tb, (void *)(_16__##FUN)); })
+#define _THUNK_C_CALLI(FUN)    _libc_thunk1 (_tb, (void *)(FUN)); })
 
 #define _THUNK_PROLOG(SIZE)  _THUNK_PASCAL_PROLOG (SIZE)
@@ -46 +46 @@
 
 #define MAKE16P(sel,off)   ((_far16ptr)((sel) << 16 | (off)))
-#define MAKEP(sel,off)     _emx_16to32 (MAKE16P (sel, off))
+#define MAKEP(sel,off)     _libc_16to32 (MAKE16P (sel, off))
 #define SELECTOROF(farptr) ((SEL)((farptr) >> 16))
 #define OFFSETOF(farptr)   ((USHORT)(farptr))