Author: ianmacarthur
Date: 2010-04-12 02:55:43 -0700 (Mon, 12 Apr 2010)
New Revision: 7485
Log:
Work around a typedef in ide_support.h that breaks win32 builds.
Does not appear to be used anyway, so nothing is lost be excising it.
NOTE: The dependency files are not up to date for fluid with the latest
modifications, so changes to the headers are not triggering a recompile of the
source files when they ought to.
Modified:
branches/branch-1.3/fluid/ide_support.h
Modified: branches/branch-1.3/fluid/ide_support.h
===================================================================
--- branches/branch-1.3/fluid/ide_support.h 2010-04-12 05:18:38 UTC (rev
7484)
+++ branches/branch-1.3/fluid/ide_support.h 2010-04-12 09:55:43 UTC (rev
7485)
@@ -32,7 +32,11 @@
#include <FL/Fl_Preferences.H>
+#ifndef WIN32
+/* Remove this typedef from win32 builds, it seems it clashes
+ * with existing symbol names. It does not appear to be used. */
typedef char UUID[40];
+#endif
typedef char XCID[25];
@@ -42,7 +46,7 @@
/* Shortcut to retrieve or create a UUID from the database */
#define MAKE_UUID(name, db) \
- char name[40]; getUUID(db, #name, name);
+ char name[40]; getUUID(db, #name, name);
/* Shortcut to retrieve, but not create a UUID from the database */
#define GET_UUID(name, db) \
@@ -50,7 +54,7 @@
/* Shortcut to retrieve or create a UUID from the database */
#define MAKE_XCID(name, db) \
-char name[25]; getXCID(db, #name, name);
+char name[25]; getXCID(db, #name, name);
/* Shortcut to retrieve, but not create a UUID from the database */
#define GET_XCID(name, db) \
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
