Changeset 21379 for trunk/include/os2wrap2.h

Timestamp:

Jul 4, 2010, 7:42:38 PM (15 years ago)

Author:

dmik

Message:

os2wrap2.h to make it possible to use OS/2 APIs from the same source that already uses Windows APIs.

File:

• trunk/include/os2wrap2.h (modified) (10 diffs)

trunk/include/os2wrap2.h

@@ -20 +20 @@
 
 sed -nr \
-  -e 's/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+_([A-Z_][A-Z1-9_]+)[[:space:]]*$/#define _\1 os2__\1\
+  -e 's/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+_([A-Z_][A-Z1-9_]+)([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#define _\1 os2__\1\
 #define \1 os2_\1/p' \
-  -e 's/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z1-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;[[:space:]]*$/#define \1 os2_\1/p' \
-  -e 's/^[[:space:]]*#define[[:space:]]+((CS|HWND|WC|MB|WM|WS|RGN|RT|DT|SWP|TA)_([A-Z1-9_]+))[[:space:]]+.*$/#define \1 os2_\1/p' \
+  -e 's/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z1-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#define \1 os2_\1/p' \
+  -e 's/^[[:space:]]*#define[[:space:]]+((CONTEXT|CS|EH|EXCEPTION|HWND|WC|MB|WM|WS|RGN|RT|DT|SWP|TA)_([A-Z1-9_]+))[[:space:]]+.*$/#define \1 os2_\1/p' \
 
  */
+#define INT os2_INT
 #define UINT os2_UINT
 #define APIRET os2_APIRET
@@ -361 +362 @@
 #define HEV os2_HEV
 #define PHEV os2_PHEV
+#define _PSEMRECORD os2__PSEMRECORD
+#define PSEMRECORD os2_PSEMRECORD
 #define PSEMRECORD os2_PSEMRECORD
 #define _AVAILDATA os2__AVAILDATA
@@ -374 +377 @@
 #define REQUESTDATA os2_REQUESTDATA
 #define PREQUESTDATA os2_PREQUESTDATA
+#define CONTEXT_CONTROL os2_CONTEXT_CONTROL
+#define CONTEXT_INTEGER os2_CONTEXT_INTEGER
+#define CONTEXT_SEGMENTS os2_CONTEXT_SEGMENTS
+#define CONTEXT_FLOATING_POINT os2_CONTEXT_FLOATING_POINT
+#define CONTEXT_FULL os2_CONTEXT_FULL
+#define EH_NONCONTINUABLE os2_EH_NONCONTINUABLE
+#define EH_UNWINDING os2_EH_UNWINDING
+#define EH_EXIT_UNWIND os2_EH_EXIT_UNWIND
+#define EH_STACK_INVALID os2_EH_STACK_INVALID
+#define EH_NESTED_CALL os2_EH_NESTED_CALL
 #define PFPREG os2_PFPREG
+#define _CONTEXT os2__CONTEXT
+#define CONTEXT os2_CONTEXT
 #define PCONTEXTRECORD os2_PCONTEXTRECORD
+#define EXCEPTION_MAXIMUM_PARAMETERS os2_EXCEPTION_MAXIMUM_PARAMETERS
 #define _EXCEPTIONREPORTRECORD os2__EXCEPTIONREPORTRECORD
 #define EXCEPTIONREPORTRECORD os2_EXCEPTIONREPORTRECORD
@@ -913 +929 @@
 #define PIX os2_PIX
 #define LINE os2_LINE
+#define _FORMATRECT os2__FORMATRECT
+#define FORMATRECT os2_FORMATRECT
 #define PFORMATRECT os2_PFORMATRECT
 #define _MLECTLDATA os2__MLECTLDATA
@@ -923 +941 @@
 #define MLEMARGSTRUCT os2_MLEMARGSTRUCT
 #define PMARGSTRUCT os2_PMARGSTRUCT
+#define _SEARCH os2__SEARCH
+#define SEARCH os2_SEARCH
 #define PMLE_SEARCHDATA os2_PMLE_SEARCHDATA
 #define TA_NORMAL_HORIZ os2_TA_NORMAL_HORIZ
@@ -1452 +1472 @@
 
 sed -nr \
-  -e 's/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+_([A-Z_][A-Z1-9_]+)[[:space:]]*$/#undef _\1\
+  -e 's/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+_([A-Z_][A-Z1-9_]+)([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#undef _\1\
 #undef \1/p' \
-  -e 's/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z1-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;[[:space:]]*$/#undef \1/p' \
-  -e 's/^[[:space:]]*#define[[:space:]]+((CS|HWND|WC|MB|WM|WS|RGN|RT|DT|SWP|TA)_([A-Z1-9_]+))[[:space:]]+.*$/#undef \1/p' \
+  -e 's/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z1-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#undef \1/p' \
+  -e 's/^[[:space:]]*#define[[:space:]]+((CONTEXT|CS|EH|EXCEPTION|HWND|WC|MB|WM|WS|RGN|RT|DT|SWP|TA)_([A-Z1-9_]+))[[:space:]]+.*$/#undef \1/p' \
 
  */
 
+#undef INT
 #undef UINT
 #undef APIRET
@@ -1794 +1815 @@
 #undef HEV
 #undef PHEV
+#undef _PSEMRECORD
+#undef PSEMRECORD
 #undef PSEMRECORD
 #undef _AVAILDATA
@@ -1807 +1830 @@
 #undef REQUESTDATA
 #undef PREQUESTDATA
+#undef CONTEXT_CONTROL
+#undef CONTEXT_INTEGER
+#undef CONTEXT_SEGMENTS
+#undef CONTEXT_FLOATING_POINT
+#undef CONTEXT_FULL
+#undef EH_NONCONTINUABLE
+#undef EH_UNWINDING
+#undef EH_EXIT_UNWIND
+#undef EH_STACK_INVALID
+#undef EH_NESTED_CALL
 #undef PFPREG
+#undef _CONTEXT
+#undef CONTEXT
 #undef PCONTEXTRECORD
+#undef EXCEPTION_MAXIMUM_PARAMETERS
 #undef _EXCEPTIONREPORTRECORD
 #undef EXCEPTIONREPORTRECORD
@@ -2346 +2382 @@
 #undef PIX
 #undef LINE
+#undef _FORMATRECT
+#undef FORMATRECT
 #undef PFORMATRECT
 #undef _MLECTLDATA
@@ -2356 +2394 @@
 #undef MLEMARGSTRUCT
 #undef PMARGSTRUCT
+#undef _SEARCH
+#undef SEARCH
 #undef PMLE_SEARCHDATA
 #undef TA_NORMAL_HORIZ