From 1fb3b9ff4b3881e090a42f2f650b3d5407bb01ba Mon Sep 17 00:00:00 2001 From: Ian MacArthur Date: Mon, 12 Apr 2010 09:55:43 +0000 Subject: 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. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7485 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/ide_support.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fluid/ide_support.h b/fluid/ide_support.h index bb74ed9e4..7bd11e471 100644 --- a/fluid/ide_support.h +++ b/fluid/ide_support.h @@ -32,7 +32,11 @@ #include +#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 @@ extern void getXCID(Fl_Preferences &db, const char *key, char *buffer); /* 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 @@ extern void getXCID(Fl_Preferences &db, const char *key, char *buffer); /* 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) \ -- cgit v1.2.3