Changeset 27 for trunk/include

Timestamp:

Jun 1, 1999, 9:48:18 PM (26 years ago)

Author:

phaller

Message:

Fix: VAC++ doesn't like the GCC function typedef with *

Location:

trunk/include/win

Files:

• heap.h (modified) (2 diffs)
• winnls.h (modified) (2 diffs)

trunk/include/win/heap.h

@@ -1 @@
-/* $Id: heap.h,v 1.1 1999-05-24 20:19:12 ktk Exp $ */
+/* $Id: heap.h,v 1.2 1999-06-01 19:48:18 phaller Exp $ */
 
 /*
@@ -34 +34 @@
 #define SEGPTR_STRDUP_WtoA(str) \
          (HIWORD(str) ? HEAP_strdupWtoA( SegptrHeap, 0, (str) ) : (LPSTR)(str))
-        /* define an inline function, a macro won't do */
-static __inline__ SEGPTR WINE_UNUSED SEGPTR_Get(LPCVOID ptr) {
-         return (HIWORD(ptr) ? HEAP_GetSegptr( SegptrHeap, 0, ptr ) : (SEGPTR)ptr);
+
+/* define an inline function, a macro won't do */
+static SEGPTR SEGPTR_Get(LPCVOID ptr)
+{
+  return (HIWORD(ptr) ? HEAP_GetSegptr( SegptrHeap, 0, ptr ) : (SEGPTR)ptr);
 }
+
 #define SEGPTR_GET(ptr) SEGPTR_Get(ptr)
 #define SEGPTR_FREE(ptr) \

trunk/include/win/winnls.h

@@ -1 @@
-/* $Id: winnls.h,v 1.2 1999-06-01 19:44:05 phaller Exp $ */
+/* $Id: winnls.h,v 1.3 1999-06-01 19:48:18 phaller Exp $ */
 
 #ifndef __WINE_WINNLS_H
@@ -578 +578 @@
 typedef DWORD CALID;
 
-typedef BOOL (CALLBACK* CALINFO_ENUMPROCA)(LPSTR);
-typedef BOOL (CALLBACK* CALINFO_ENUMPROCW)(LPWSTR);
+#if (defined(__IBMCPP__) || defined(__IBMC__))
+  typedef BOOL (CALLBACK tCALINFO_ENUMPROCA)(LPSTR);
+  typedef BOOL (CALLBACK tCALINFO_ENUMPROCW)(LPWSTR);
+  typedef tCALINFO_ENUMPROCA *CALINFO_ENUMPROCA;
+  typedef tCALINFO_ENUMPROCW *CALINFO_ENUMPROCW;
+#else
+  typedef BOOL (CALLBACK* CALINFO_ENUMPROCA)(LPSTR);
+  typedef BOOL (CALLBACK* CALINFO_ENUMPROCW)(LPWSTR);
+#endif
+
+
 DECL_WINELIB_TYPE_AW(CALINFO_ENUMPROC)