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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/13 18:41:19

Modified files:
        .              : ChangeLog 
        gui            : sdl.cpp sdl_ogl_glue.cpp 

Log message:
        Fixed some #defines that were reverted.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1203&r2=1.1204
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_ogl_glue.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1203
retrieving revision 1.1204
diff -u -b -r1.1203 -r1.1204
--- ChangeLog   13 Oct 2006 17:26:50 -0000      1.1203
+++ ChangeLog   13 Oct 2006 18:41:19 -0000      1.1204
@@ -1,3 +1,8 @@
+2006-10-13 Markus Gothe <address@hidden>
+
+       * gui/sdl.cpp, gui/sdl_ogl_glue.cpp: Fixed some #defines that were 
+         reverted.
+
 2006-10-13 Udo Giacomozzi
 
        * testuite/movies.all/gravity.swf: Added test movie

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gui/sdl.cpp 13 Oct 2006 16:46:23 -0000      1.38
+++ gui/sdl.cpp 13 Oct 2006 18:41:19 -0000      1.39
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.38 2006/10/13 16:46:23 bjacques Exp $ */
+/* $Id: sdl.cpp,v 1.39 2006/10/13 18:41:19 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
@@ -49,8 +49,8 @@
 
 #if defined(_WIN32) || defined(WIN32)
        #include "getopt_win32.h"
-#if 0
-// I don't understand the point of any of this.
+       #define basename(x) x
+#else
        #include <unistd.h>
 
 #ifndef __THROW

Index: gui/sdl_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_ogl_glue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gui/sdl_ogl_glue.cpp        13 Oct 2006 16:46:23 -0000      1.1
+++ gui/sdl_ogl_glue.cpp        13 Oct 2006 18:41:19 -0000      1.2
@@ -41,33 +41,6 @@
 
 #include "log.h"
 
-
-#if defined(_WIN32) || defined(WIN32)
-#      define basename(x) x
-#      include "getopt_win32.h"
-#      ifndef _INC_WINDOWS
-
-#              define WINAPI   __stdcall
-#              define APIENTRY WINAPI
-#              define CALLBACK __stdcall
-#              define DECLSPEC_IMPORT __declspec(dllimport)
-
-#              if !defined(_GDI32_)
-#                      define WINGDIAPI DECLSPEC_IMPORT
-#              else
-#                      define WINGDIAPI
-#              endif
-
-#      else
-#              define WIN32_LEAN_AND_MEAN
-#              include <windows.h>
-#      endif
-#endif
-
-#if defined(__sgi) || defined(SGI) || defined(__sgi__)
-       #define basename(x) x
-#endif
-
 #define OVERSIZE 1.0f
 
 using namespace std;