[Gnash-commit] gnash ChangeLog gui/Player.cpp gui/gnash.cpp gu...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/17 22:27:26

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

Log message:
                * gui/sdl.cpp, gui/gnash.cpp, utilities/parser.cpp,
                  utilities/processor.cpp: extern "C" {getopt()}.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1275&r2=1.1276
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1275
retrieving revision 1.1276
diff -u -b -r1.1275 -r1.1276
--- ChangeLog   17 Oct 2006 22:00:37 -0000      1.1275
+++ ChangeLog   17 Oct 2006 22:27:25 -0000      1.1276
@@ -13,6 +13,10 @@
        * backend/sound_handler_sdl.h: <SDL/SDL_audio.h> -> <SDL_audio.h>
        * backend/sound_handler_sdl.cpp: <SDL.h> -> <SDL.h>
        * macros/sdl.m4: Fixed wrong search-path.
+       * gui/Player.cpp: Removed getopt_win32.h include.
+       * gui/gnash.cpp: Added declaration of getopt, optind and optarg.
+       * gui/sdl.cpp, gui/gnash.cpp, utilities/parser.cpp, 
+         utilities/processor.cpp: extern "C" {getopt()}.
 
 2006-10-17  Rob Savoye  <address@hidden>
 

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gui/Player.cpp      17 Oct 2006 09:25:59 -0000      1.20
+++ gui/Player.cpp      17 Oct 2006 22:27:25 -0000      1.21
@@ -63,11 +63,6 @@
 # define GUI_CLASS FBGui 
 #endif
 
-
-#if defined(_WIN32) || defined(WIN32)
-# include "getopt_win32.h"
-#endif
-
 #include "NullGui.h"
 
 #include "gnash.h"

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- gui/gnash.cpp       17 Oct 2006 10:02:44 -0000      1.49
+++ gui/gnash.cpp       17 Oct 2006 22:27:25 -0000      1.50
@@ -44,9 +44,28 @@
 #include "log.h" // for dbglogfile (I hate this)
 
 #if defined(_WIN32) || defined(WIN32)
-#      include "getopt_win32.h"
+        #include "getopt_win32.h"
+#else
+extern "C"{
+        #include <unistd.h>
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW       throw ()
+# else
+#  define __THROW
+# endif
 #endif
 
+        extern int optind, getopt(int, char *const *, const char *) __THROW;
+       extern char *optarg; // global argument pointer
+}
+#endif // Win32
+
+
 #include <iostream>
 
 using namespace gnash; // for dbglogfile

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gui/sdl.cpp 16 Oct 2006 15:27:53 -0000      1.42
+++ gui/sdl.cpp 17 Oct 2006 22:27:25 -0000      1.43
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.42 2006/10/16 15:27:53 bjacques Exp $ */
+/* $Id: sdl.cpp,v 1.43 2006/10/17 22:27:25 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
@@ -50,6 +50,7 @@
 #if defined(_WIN32) || defined(WIN32)
        #include "getopt_win32.h"
 #else
+extern "C"{
        #include <unistd.h>
 
 #ifndef __THROW
@@ -64,7 +65,7 @@
 #endif
 
        extern int getopt(int, char *const *, const char *) __THROW;
-
+}
 #endif // Win32
 
 #include "gnash.h"

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- utilities/parser.cpp        3 Oct 2006 12:01:07 -0000       1.19
+++ utilities/parser.cpp        17 Oct 2006 22:27:25 -0000      1.20
@@ -36,7 +36,7 @@
 // carries forward this exception.
 //
 
-/* $Id: parser.cpp,v 1.19 2006/10/03 12:01:07 nihilus Exp $ */
+/* $Id: parser.cpp,v 1.20 2006/10/17 22:27:25 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,8 +44,11 @@
 
 #include <iostream>
 #include <cstdio>
+
+extern "C"{
 #include <unistd.h>
 
+
 #ifndef __THROW
 # ifndef __GNUC_PREREQ
 #  define __GNUC_PREREQ(maj, min) (0)
@@ -58,6 +61,8 @@
 #endif
 
 extern int optind, getopt(int, char *const *, const char *) __THROW;
+}
+
 #include "tu_file.h"
 #include "zlib_adapter.h"
 #include "image.h"

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- utilities/processor.cpp     3 Oct 2006 12:01:07 -0000       1.25
+++ utilities/processor.cpp     17 Oct 2006 22:27:25 -0000      1.26
@@ -37,7 +37,7 @@
 //
 //
 
-/* $Id: processor.cpp,v 1.25 2006/10/03 12:01:07 nihilus Exp $ */
+/* $Id: processor.cpp,v 1.26 2006/10/17 22:27:25 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -56,9 +56,9 @@
 
 #include <iostream>
 #include <cstdio>
+extern "C"{
 #include <unistd.h>
 
-
 #ifndef __THROW
 # ifndef __GNUC_PREREQ
 #  define __GNUC_PREREQ(maj, min) (0)
@@ -71,6 +71,7 @@
 #endif
 
 extern int optind, getopt(int, char *const *, const char *) __THROW;
+}
 
 bool gofast = false;           // FIXME: this flag gets set based on
                                // an XML message written using