[Gnash-commit] gnash ChangeLog gui/gnash.cpp gui/sdl.cpp utili...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/18 12:36:49

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp sdl.cpp 
        utilities      : Makefile.am parser.cpp processor.cpp 

Log message:
        #ifndef __GNUC__ keeps the bisons away.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1289&r2=1.1290
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1289
retrieving revision 1.1290
diff -u -b -r1.1289 -r1.1290
--- ChangeLog   18 Oct 2006 12:00:35 -0000      1.1289
+++ ChangeLog   18 Oct 2006 12:36:49 -0000      1.1290
@@ -1,3 +1,8 @@
+2006-10-18 Markus Gothe <address@hidden>
+
+       * gui/gnash.cpp, gui/sdl.cpp, utilities/parser.cpp, 
+         utilities/processor.cpp: #ifndef __GNUC__ keeps the bisons away.
+
 2006-10-18 Sandro Santilli <address@hidden>
 
        * server/xml.cpp (setupFrame): static cast pointer arg for %p to

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- gui/gnash.cpp       18 Oct 2006 11:16:57 -0000      1.52
+++ gui/gnash.cpp       18 Oct 2006 12:36:49 -0000      1.53
@@ -50,7 +50,8 @@
         #include <unistd.h>
 #ifdef HAVE_GETOPT_H
        #include <getopt.h>
-#else
+#endif
+#ifndef __GNUC__
         extern int optind, getopt(int, char *const *, const char *);
        extern char *optarg; // global argument pointer
 #endif

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gui/sdl.cpp 18 Oct 2006 11:31:20 -0000      1.45
+++ gui/sdl.cpp 18 Oct 2006 12:36:49 -0000      1.46
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.45 2006/10/18 11:31:20 strk Exp $ */
+/* $Id: sdl.cpp,v 1.46 2006/10/18 12:36:49 nihilus Exp $ */
 
 // XXXbjacques: Screw up the indentation in this file, and you're dead. And by
 //              screw up, I mean not adhering the indentation used throughout
@@ -51,10 +51,11 @@
        #include "getopt_win32.h"
 #else
 extern "C"{
+#include <unistd.h>
 #ifdef HAVE_GETOPT_H
        #include <getopt.h>
-#else
-       #include <unistd.h>
+#endif
+#ifndef __GNUC__
        extern int getopt(int, char *const *, const char *);
 #endif
 }

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- utilities/Makefile.am       11 Oct 2006 21:50:56 -0000      1.31
+++ utilities/Makefile.am       18 Oct 2006 12:36:49 -0000      1.32
@@ -24,10 +24,7 @@
 #    on the gnash libraries side instead ?
 
 GNASH_LIBS = \
-       $(top_builddir)/backend/libgnashbackend.la \
        $(top_builddir)/server/libgnashserver.la \
-       $(top_builddir)/server/asobj/libgnashasobjs.la \
-       $(top_builddir)/libgeometry/libgnashgeo.la \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libamf/libgnashamf.la 
 
@@ -45,9 +42,7 @@
         -I$(top_srcdir)/server \
         -I$(top_srcdir)/server/parser \
         -I$(top_srcdir)/libgeometry \
-        $(LIBXML_CFLAGS) \
-        $(SDL_CFLAGS) \
-       $(BOOST_CFLAGS)
+        $(LIBXML_CFLAGS)
 
 if USE_FFMPEG_ENGINE
  INCLUDES += $(FFMPEG_INCLS) 

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- utilities/parser.cpp        18 Oct 2006 11:29:08 -0000      1.23
+++ utilities/parser.cpp        18 Oct 2006 12:36:49 -0000      1.24
@@ -36,7 +36,7 @@
 // carries forward this exception.
 //
 
-/* $Id: parser.cpp,v 1.23 2006/10/18 11:29:08 strk Exp $ */
+/* $Id: parser.cpp,v 1.24 2006/10/18 12:36:49 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -49,7 +49,8 @@
        #include <unistd.h>
 #ifdef HAVE_GETOPT_H
        #include <getopt.h>
-#else
+#endif
+#ifndef __GNUC__
        extern int optind, getopt(int, char *const *, const char *);
 #endif
 }

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- utilities/processor.cpp     18 Oct 2006 11:29:09 -0000      1.28
+++ utilities/processor.cpp     18 Oct 2006 12:36:49 -0000      1.29
@@ -37,7 +37,7 @@
 //
 //
 
-/* $Id: processor.cpp,v 1.28 2006/10/18 11:29:09 strk Exp $ */
+/* $Id: processor.cpp,v 1.29 2006/10/18 12:36:49 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -60,7 +60,8 @@
        #include <unistd.h>
 #ifdef HAVE_GETOPT_H
        #include <getopt.h>
-#else
+#endif
+#ifndef __GNUC__
        extern int optind, getopt(int, char *const *, const char *);
 #endif
 }