[Patch] winsock.h inclusion
Pierre d'Herbemont
stegefin at free.fr
Sat Jun 18 16:08:29 CDT 2005
Alexandre,
Using the current CVS on Darwin/Mac OS X, there are still compilation
errors related to winsock.h inclusion. The error was:
../../../include/winsock.h:414: error: redefinition of 'struct timeval'
My solution is to include "wine/test.h" after every other header.
Thanks,
Pierre.
ChangeLog:
- include "wine/test.h" after every other header to allow compilation
on Mac OS X.
-------------- next part --------------
Index: dlls/ddraw/tests/d3d.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/tests/d3d.c,v
retrieving revision 1.3
diff -u -r1.3 d3d.c
--- dlls/ddraw/tests/d3d.c 13 Jun 2005 12:10:55 -0000 1.3
+++ dlls/ddraw/tests/d3d.c 18 Jun 2005 21:02:11 -0000
@@ -19,10 +19,12 @@
*/
#include <assert.h>
-#include "wine/test.h"
+
#include "ddraw.h"
#include "d3d.h"
+#include "wine/test.h"
+
static LPDIRECTDRAW7 lpDD = NULL;
static LPDIRECT3D7 lpD3D = NULL;
static LPDIRECTDRAWSURFACE7 lpDDS = NULL;
Index: dlls/ddraw/tests/ddrawmodes.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/tests/ddrawmodes.c,v
retrieving revision 1.5
diff -u -r1.5 ddrawmodes.c
--- dlls/ddraw/tests/ddrawmodes.c 13 Jun 2005 12:10:55 -0000 1.5
+++ dlls/ddraw/tests/ddrawmodes.c 18 Jun 2005 21:02:11 -0000
@@ -19,9 +19,11 @@
*/
#include <assert.h>
-#include "wine/test.h"
+
#include "ddraw.h"
+#include "wine/test.h"
+
static LPDIRECTDRAW lpDD = NULL;
static LPDIRECTDRAWSURFACE lpDDSPrimary = NULL;
static LPDIRECTDRAWSURFACE lpDDSBack = NULL;
Index: dlls/ddraw/tests/dsurface.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/tests/dsurface.c,v
retrieving revision 1.3
diff -u -r1.3 dsurface.c
--- dlls/ddraw/tests/dsurface.c 17 Jun 2005 20:59:49 -0000 1.3
+++ dlls/ddraw/tests/dsurface.c 18 Jun 2005 21:02:11 -0000
@@ -19,9 +19,11 @@
*/
#include <assert.h>
-#include "wine/test.h"
+
#include "ddraw.h"
+#include "wine/test.h"
+
static LPDIRECTDRAW lpDD = NULL;
static void CreateDirectDraw()
Index: dlls/kernel/tests/profile.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/profile.c,v
retrieving revision 1.8
diff -u -r1.8 profile.c
--- dlls/kernel/tests/profile.c 14 Jun 2005 11:40:04 -0000 1.8
+++ dlls/kernel/tests/profile.c 18 Jun 2005 21:02:11 -0000
@@ -20,10 +20,10 @@
#include <stdarg.h>
-#include "wine/test.h"
#include "windef.h"
#include "winbase.h"
#include "windows.h"
+#include "wine/test.h"
#define KEY "ProfileInt"
#define SECTION "Test"
Index: dlls/mapi32/tests/prop.c
===================================================================
RCS file: /home/wine/wine/dlls/mapi32/tests/prop.c,v
retrieving revision 1.9
diff -u -r1.9 prop.c
--- dlls/mapi32/tests/prop.c 14 Jun 2005 19:18:18 -0000 1.9
+++ dlls/mapi32/tests/prop.c 18 Jun 2005 21:02:14 -0000
@@ -20,7 +20,6 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "wine/test.h"
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
@@ -28,6 +27,7 @@
#include "winnt.h"
#include "mapiutil.h"
#include "mapitags.h"
+#include "wine/test.h"
HRESULT WINAPI MAPIInitialize(LPVOID);
Index: dlls/ole32/tests/storage32.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/tests/storage32.c,v
retrieving revision 1.12
diff -u -r1.12 storage32.c
--- dlls/ole32/tests/storage32.c 15 Jun 2005 10:20:30 -0000 1.12
+++ dlls/ole32/tests/storage32.c 18 Jun 2005 21:02:14 -0000
@@ -22,13 +22,13 @@
#define COBJMACROS
-#include "wine/test.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "ole2.h"
#include "objidl.h"
#include "initguid.h"
+#include "wine/test.h"
DEFINE_GUID( test_stg_cls, 0x88888888, 0x0425, 0x0000, 0,0,0,0,0,0,0,0);
Index: dlls/oleaut32/tests/olepicture.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tests/olepicture.c,v
retrieving revision 1.2
diff -u -r1.2 olepicture.c
--- dlls/oleaut32/tests/olepicture.c 17 Jun 2005 20:59:49 -0000 1.2
+++ dlls/oleaut32/tests/olepicture.c 18 Jun 2005 21:02:15 -0000
@@ -27,7 +27,6 @@
#define COBJMACROS
-#include <wine/test.h>
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
@@ -40,6 +39,8 @@
#include <olectl.h>
#include <objidl.h>
+#include <wine/test.h>
+
static HMODULE hOleaut32;
static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*);
Index: dlls/oleaut32/tests/typelib.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tests/typelib.c,v
retrieving revision 1.3
diff -u -r1.3 typelib.c
--- dlls/oleaut32/tests/typelib.c 16 Jun 2005 10:45:25 -0000 1.3
+++ dlls/oleaut32/tests/typelib.c 18 Jun 2005 21:02:15 -0000
@@ -20,13 +20,14 @@
#define COBJMACROS
-#include <wine/test.h>
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "oleauto.h"
+#include <wine/test.h>
+
static void ref_count_test(LPCWSTR type_lib)
{
ITypeLib *iface;
Index: dlls/oleaut32/tests/vartype.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/tests/vartype.c,v
retrieving revision 1.25
diff -u -r1.25 vartype.c
--- dlls/oleaut32/tests/vartype.c 17 Jun 2005 10:11:37 -0000 1.25
+++ dlls/oleaut32/tests/vartype.c 18 Jun 2005 21:02:17 -0000
@@ -18,11 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "wine/test.h"
#include "wine/unicode.h"
#include "oleauto.h"
#include <math.h>
+#include "wine/test.h"
+
/* Some Visual C++ versions choke on __uint64 to float conversions.
* To fix this you need either VC++ 6.0 plus the processor pack
* or Visual C++ >=7.0.
Index: dlls/shlwapi/tests/path.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/tests/path.c,v
retrieving revision 1.22
diff -u -r1.22 path.c
--- dlls/shlwapi/tests/path.c 14 Jun 2005 17:21:18 -0000 1.22
+++ dlls/shlwapi/tests/path.c 18 Jun 2005 21:02:18 -0000
@@ -21,13 +21,13 @@
#include <stdarg.h>
#include <stdio.h>
-#include "wine/test.h"
#include "windef.h"
#include "winbase.h"
#include "wine/unicode.h"
#include "winreg.h"
#include "shlwapi.h"
#include "wininet.h"
+#include "wine/test.h"
static HMODULE hShlwapi;
static HRESULT (WINAPI *pPathIsValidCharA)(char,DWORD);
Index: dlls/shlwapi/tests/string.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/tests/string.c,v
retrieving revision 1.11
diff -u -r1.11 string.c
--- dlls/shlwapi/tests/string.c 14 Jun 2005 17:21:18 -0000 1.11
+++ dlls/shlwapi/tests/string.c 18 Jun 2005 21:02:19 -0000
@@ -21,7 +21,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
@@ -31,6 +31,8 @@
#define NO_SHLWAPI_STREAM
#include "shlwapi.h"
#include "shtypes.h"
+#include "wine/test.h"
+
static HMODULE hShlwapi;
static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int);
More information about the wine-patches
mailing list