diff options
| -rw-r--r-- | fluid/ide_support.h | 8 |
1 files 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 <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 @@ 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) \ |