Changeset 4054 for trunk/include/win/wine/undocshell.h

Timestamp:

Aug 20, 2000, 11:46:16 AM (25 years ago)

Author:

sandervl

Message:

compile fixes

File:

• trunk/include/win/wine/undocshell.h (modified) (4 diffs)

trunk/include/win/wine/undocshell.h

@@ -1 @@
-/* $Id: undocshell.h,v 1.4 2000-08-18 02:04:23 phaller Exp $ */
+/* $Id: undocshell.h,v 1.5 2000-08-20 09:46:16 sandervl Exp $ */
 #ifndef __WINE_UNDOCSHELL_H
 #define __WINE_UNDOCSHELL_H
@@ -385 +385 @@
 /* FileMenu_InsertUsingPidl callback function */
 //typedef void CALLBACK (*LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
-typedef void (CALLBACK *LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
+#ifdef __WIN32OS2__
+typedef void (* CALLBACK LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
+#else
+typedef void (CALLBACK * LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile);
+#endif
 
 int WINAPI FileMenu_InsertUsingPidl(
@@ -711 +715 @@
 
 /* SHCreateShellFolderViewEx callback function */
+#ifdef __WIN32OS2__
+typedef HRESULT (* CALLBACK LPFNSFVCALLBACK)(
+#else
 typedef HRESULT (CALLBACK* LPFNSFVCALLBACK)(
+#endif
         DWORD dwUser,
         LPSHELLFOLDER pshf,
@@ -903 +911 @@
 /* SHCreateDefClassObject callback function */
 //typedef HRESULT CALLBACK (*LPFNCDCOCALLBACK)(
+#ifdef __WIN32OS2__
+typedef HRESULT (* CALLBACK LPFNCDCOCALLBACK)(
+#else
 typedef HRESULT (CALLBACK *LPFNCDCOCALLBACK)(
+#endif
         LPUNKNOWN pUnkOuter,
         REFIID riidObject,