PATCH - some build fixes for w32api headers

Steven Edwards steven_ed4153 at yahoo.com
Wed Aug 20 19:32:46 CDT 2003


Nothing links yet. I still need to talk to you guys about winebuild 
and how the hell we are going to get it going. Also if anyone else
wants to play with building WINE with the w32api headers libwine is
still not 100% I will need to send you a small patch for wrc and 
non standard language IDs.

I will send a email later about libwine and winebuild problems.

Thanks
Steven

Changelog: Fixes for building with w32api headers on Mingw

Index: aspi.c
===================================================================
RCS file: /home/wine/wine/dlls/winaspi/aspi.c,v
retrieving revision 1.18
diff -u -r1.18 aspi.c
--- aspi.c	17 Aug 2002 00:43:17 -0000	1.18
+++ aspi.c	21 Aug 2003 00:30:36 -0000
@@ -40,6 +40,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -52,10 +53,13 @@
 #include <errno.h>
 #include <string.h>
 
-#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "winescsi.h"
+
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(aspi);

Index: crtdll_main.c
===================================================================
RCS file: /home/wine/wine/dlls/crtdll/crtdll_main.c,v
retrieving revision 1.51
diff -u -r1.51 crtdll_main.c
--- crtdll_main.c	30 Jun 2003 20:53:50 -0000	1.51
+++ crtdll_main.c	21 Aug 2003 00:27:06 -0000
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <stdarg.h>
 #include <sys/stat.h>
 
 #include "windef.h"

Index: bin2res.c
===================================================================
RCS file: /home/wine/wine/tools/bin2res.c,v
retrieving revision 1.14
diff -u -r1.14 bin2res.c
--- bin2res.c	18 Aug 2003 20:00:44 -0000	1.14
+++ bin2res.c	21 Aug 2003 00:17:10 -0000
@@ -34,6 +34,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H

Index: genres.c
===================================================================
RCS file: /home/wine/wine/tools/wrc/genres.c,v
retrieving revision 1.20
diff -u -r1.20 genres.c
--- genres.c	15 Aug 2002 21:57:36 -0000	1.20
+++ genres.c	21 Aug 2003 00:06:58 -0000
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>

Index: capability.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/capability.c,v
retrieving revision 1.2
diff -u -r1.2 capability.c
--- capability.c	31 May 2002 23:40:53 -0000	1.2
+++ capability.c	20 Aug 2003 23:32:44 -0000
@@ -16,6 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <stdarg.h>
+
+#include "windef.h"
 #include "winbase.h"
 #include "twain.h"
 #include "twain_i.h"

Index: ds_image.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/ds_image.c,v
retrieving revision 1.3
diff -u -r1.3 ds_image.c
--- ds_image.c	25 Oct 2002 03:50:14 -0000	1.3
+++ ds_image.c	20 Aug 2003 23:33:01 -0000
@@ -18,6 +18,9 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
+#include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"

Index: dsm_ctrl.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/dsm_ctrl.c,v
retrieving revision 1.5
diff -u -r1.5 dsm_ctrl.c
--- dsm_ctrl.c	7 Jan 2003 20:36:24 -0000	1.5
+++ dsm_ctrl.c	20 Aug 2003 23:33:20 -0000
@@ -21,9 +21,11 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdarg.h>
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "windef.h"
 #include "winbase.h"
 #include "twain.h"
 #include "twain_i.h"

Index: twain32_main.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/twain32_main.c,v
retrieving revision 1.5
diff -u -r1.5 twain32_main.c
--- twain32_main.c	30 Jun 2003 20:53:49 -0000	1.5
+++ twain32_main.c	20 Aug 2003 23:33:38 -0000
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <stdarg.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "twain.h"

Index: advapi.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/advapi.c,v
retrieving revision 1.22
diff -u -r1.22 advapi.c
--- advapi.c	12 Aug 2003 18:53:14 -0000	1.22
+++ advapi.c	21 Aug 2003 00:14:08 -0000
@@ -24,9 +24,10 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
 
-#include "winbase.h"
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "winerror.h"
 


__________________________________
Do you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com



More information about the wine-patches mailing list