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

[Markus Gothe]

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

Modified files:
        .              : ChangeLog 
        gui            : sdl.cpp 

Log message:
        Fixed includes for getopt() and basename().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1171&r2=1.1172
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1171
retrieving revision 1.1172
diff -u -b -r1.1171 -r1.1172
--- ChangeLog   12 Oct 2006 16:37:25 -0000      1.1171
+++ ChangeLog   12 Oct 2006 18:30:41 -0000      1.1172
@@ -1,3 +1,7 @@
+2006-10-12 Markus Gothe <address@hidden>
+
+       * gui/sdl.cpp: fixed includes for getopt() and basename().
+
 2006-10-12 Udo Giacomozzi <address@hidden>
   
   * gnash/gui/fb.cpp, gnash/gui/fbsup.h, gnash/gui/gui.cpp,

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gui/sdl.cpp 12 Oct 2006 18:16:03 -0000      1.32
+++ gui/sdl.cpp 12 Oct 2006 18:30:42 -0000      1.33
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.32 2006/10/12 18:16:03 nihilus Exp $ */
+/* $Id: sdl.cpp,v 1.33 2006/10/12 18:30:42 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,6 +43,21 @@
 
 #include <cstdio>
 #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;
+
+#include <libgen.h> //For POSIX basename().
 #include "gnash.h"
 #include "log.h"
 #include "sdlsup.h"
@@ -75,10 +90,6 @@
 #      endif
 #endif
 
-#if defined(__sgi) || defined(SGI) || defined(__sgi__)
-       #define basename(x) x
-#endif
-
 #include <GL/gl.h>
 #include <GL/glu.h>
 #endif // RENDERER_OPENGL