[Gnash-commit] gnash ChangeLog server/GnashKey.h

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/03 07:23:45

Modified files:
        .              : ChangeLog 
        server         : GnashKey.h 

Log message:
        Try fixing mingw build again.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6778&r2=1.6779
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GnashKey.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6778
retrieving revision 1.6779
diff -u -b -r1.6778 -r1.6779
--- ChangeLog   3 Jun 2008 06:57:11 -0000       1.6778
+++ ChangeLog   3 Jun 2008 07:23:44 -0000       1.6779
@@ -1,3 +1,7 @@
+2008-06-03 Benjamin Wolsey <address@hidden>
+
+       * server/GnashKey.h: yes, REGISTERED does cause problems on mingw.
+
 2008-06-03 Sandro Santilli <address@hidden>
 
        * server/video_stream_instance.h: drop unneeded include.

Index: server/GnashKey.h
===================================================================
RCS file: /sources/gnash/gnash/server/GnashKey.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/GnashKey.h   2 Jun 2008 09:52:52 -0000       1.1
+++ server/GnashKey.h   3 Jun 2008 07:23:45 -0000       1.2
@@ -23,6 +23,12 @@
 
 namespace key {
 
+/// Conflicts with mingw header with gcc3.x (or whatever
+/// antiquated version mingw has).
+#ifdef _WIN32
+# undef REGISTERED
+#endif
+
 enum modifier
 {
     GNASH_MOD_NONE = 0,