Error building trunk w/MinGW part deux

Gmail won't let me attach the file. Here is the patch.

Bobby

Index: config.h.in
===================================================================
--- config.h.in (revision 25856)
+++ config.h.in (working copy)
@@ -154,17 +154,8 @@
    `char[]'. */
 #undef YYTEXT_POINTER

-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-#undef _UINT32_T
-
 /* minimal comctl.dll v4.70 for toolbars */
 #undef _WIN32_IE

 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
- such a type exists and the standard includes do not define it. */
-#undef uint32_t
Index: src/af/xap/xp/xap_Module.h
===================================================================
--- src/af/xap/xp/xap_Module.h (revision 25856)
+++ src/af/xap/xp/xap_Module.h (working copy)
@@ -52,13 +52,13 @@
 // we want to have C linkage for both
 // this and for all of our required functions
 extern "C" {
- typedef ABI_EXPORT struct {
+ typedef ABI_EXPORT struct XAP_ModuleInfo {
                 const char * name;
                 const char * desc;
                 const char * version;
                 const char * author;
                 const char * usage;
- } XAP_ModuleInfo;
+ } ;
 }

 class XAP_ModuleManager;
Index: src/plugins/Makefile.am
===================================================================
--- src/plugins/Makefile.am (revision 25856)
+++ src/plugins/Makefile.am (working copy)
@@ -29,10 +29,11 @@

 # visit the plugins we're going to link statically and build them
 all-local:
- for plugin in $(BUILTIN_PLUGINS); do \
+ if [ ! -n "$(BUILTIN_PLUGINS)" ]; then \
+ for plugin in "$(BUILTIN_PLUGINS)"; do \
                 (cd ../../plugins/$$plugin && $(MAKE) $(AM_MAKEFLAGS) all); \
- done
-
+ done; \
+ fi
 $(BUILTIN_STAMP):
         echo $(BUILTIN_PLUGINS) > $(BUILTIN_STAMP)
Received on Fri Mar 6 21:53:00 2009