[Gnash-commit] gnash gui/gnash.cpp gui/sdl.cpp utilities/parse...

[Markus Gothe]

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

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

Log message:
        since extern "C" ifdefs are unnecessary.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- gui/gnash.cpp       17 Oct 2006 22:27:25 -0000      1.50
+++ gui/gnash.cpp       17 Oct 2006 22:29:51 -0000      1.51
@@ -48,19 +48,7 @@
 #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 int optind, getopt(int, char *const *, const char *);
        extern char *optarg; // global argument pointer
 }
 #endif // Win32

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- gui/sdl.cpp 17 Oct 2006 22:27:25 -0000      1.43
+++ gui/sdl.cpp 17 Oct 2006 22:29:51 -0000      1.44
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.43 2006/10/17 22:27:25 nihilus Exp $ */
+/* $Id: sdl.cpp,v 1.44 2006/10/17 22:29:51 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
@@ -52,19 +52,7 @@
 #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 getopt(int, char *const *, const char *) __THROW;
+       extern int getopt(int, char *const *, const char *);
 }
 #endif // Win32
 

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- utilities/parser.cpp        17 Oct 2006 22:27:25 -0000      1.20
+++ utilities/parser.cpp        17 Oct 2006 22:29:51 -0000      1.21
@@ -36,7 +36,7 @@
 // carries forward this exception.
 //
 
-/* $Id: parser.cpp,v 1.20 2006/10/17 22:27:25 nihilus Exp $ */
+/* $Id: parser.cpp,v 1.21 2006/10/17 22:29:51 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -46,21 +46,8 @@
 #include <cstdio>
 
 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;
+       #include <unistd.h>
+       extern int optind, getopt(int, char *const *, const char *) __THROW;
 }
 
 #include "tu_file.h"

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- utilities/processor.cpp     17 Oct 2006 22:27:25 -0000      1.26
+++ utilities/processor.cpp     17 Oct 2006 22:29:51 -0000      1.27
@@ -37,7 +37,7 @@
 //
 //
 
-/* $Id: processor.cpp,v 1.26 2006/10/17 22:27:25 nihilus Exp $ */
+/* $Id: processor.cpp,v 1.27 2006/10/17 22:29:51 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,20 +57,8 @@
 #include <iostream>
 #include <cstdio>
 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;
+       #include <unistd.h>
+       extern int optind, getopt(int, char *const *, const char *);
 }
 
 bool gofast = false;           // FIXME: this flag gets set based on