Fix Unix build.

svn path=/trunk/; revision=49086
This commit is contained in:
Eric Kohl 2010-10-09 22:54:37 +00:00
parent 71c108681a
commit c30d993d2e
2 changed files with 23 additions and 2 deletions

View file

@ -302,7 +302,7 @@ typedef struct {
* *
*/ */
#include "pshpack1.h" #include <host/pshpack1.h>
typedef struct { typedef struct {
/*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */ /*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */
@ -599,7 +599,7 @@ WORD offset from start of block to SAFEARRAY
WORD typeofarray WORD typeofarray
*/ */
#include "poppack.h" #include <host/poppack.h>
/*---------------------------END--------------------------------------------*/ /*---------------------------END--------------------------------------------*/
#endif #endif

View file

@ -41,6 +41,27 @@ diff -u wine-1.3.4/tools/widl/typelib.c tools/widl/typelib.c
#include "widl.h" #include "widl.h"
#include "utils.h" #include "utils.h"
diff -u wine-1.3.4/tools/widl/typelib_struct.h tools/widl/typelib_struct.h
--- wine-1.3.4/tools/widl/typelib_struct.h 2010-09-19 17:50:40.953125000 +0200
+++ tools/widl/typelib_struct.h 2010-10-10 00:50:32.921875000 +0200
@@ -302,7 +302,7 @@
*
*/
-#include "pshpack1.h"
+#include <host/pshpack1.h>
typedef struct {
/*00*/ DWORD SLTG_magic; /* 0x47544c53 == "SLTG" */
@@ -599,7 +599,7 @@
WORD typeofarray
*/
-#include "poppack.h"
+#include <host/poppack.h>
/*---------------------------END--------------------------------------------*/
#endif
diff -u wine-1.3.4/tools/widl/widltypes.h tools/widl/widltypes.h diff -u wine-1.3.4/tools/widl/widltypes.h tools/widl/widltypes.h
--- wine-1.3.4/tools/widl/widltypes.h 2010-09-19 17:51:38.890625000 +0200 --- wine-1.3.4/tools/widl/widltypes.h 2010-09-19 17:51:38.890625000 +0200
+++ tools/widl/widltypes.h 2010-09-19 19:17:19.656250000 +0200 +++ tools/widl/widltypes.h 2010-09-19 19:17:19.656250000 +0200