Changeset 21598 for trunk/include

Timestamp:

Mar 23, 2011, 5:49:23 PM (14 years ago)

Author:

dmik

Message:

win32type.h: Fixed a couple of declarations incompatible with C mode.

File:

• trunk/include/win32type.h (modified) (4 diffs)

trunk/include/win32type.h

@@ -183 +183 @@
 
 // boolean
-typedef unsigned long   BOOL32;
-typedef unsigned short  BOOL16;
-
+typedef unsigned short  BOOL16_W;
 #ifdef __FORCE_BOOL_AS_INT__
-typedef int             BOOL;
+typedef int             BOOL_W;
 #else
-typedef unsigned long   BOOL;
-#endif
-
+typedef unsigned long   BOOL_W;
+#endif
 
 #ifndef FALSE
@@ -564 +561 @@
  *****************************************************************************/
 
-//PH: Warning -- OS/2  has BOOL == unsigned long,
-//               Win32 has BOOL == int.
-typedef int             BOOL32_W;
-typedef int             BOOL_W;
-
-
-
-
-
-
-
 //@@@PH -----------------------------------------------------------------------
 #if 0
@@ -623 +609 @@
 } OVERLAPPED, *LPOVERLAPPED;
 
-typedef VOID (WIN32API *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode,
-                                                         DWORD dwNumberOfBytesTransfered,
-                                                         LPOVERLAPPED lpOverlapped);
+typedef VOID (* WIN32API LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode,
+                                                          DWORD dwNumberOfBytesTransfered,
+                                                          LPOVERLAPPED lpOverlapped);
 
 #endif
@@ -1326 +1312 @@
 
 
-typedef VOID (CALLBACK *TIMERPROC)(HWND hwnd, UINT msg, UINT id, DWORD dwTime);
+typedef VOID (* CALLBACK TIMERPROC)(HWND hwnd, UINT msg, UINT id, DWORD dwTime);
 
 typedef struct