[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/gui sdl.cpp
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash/gui sdl.cpp |
Date: |
Thu, 12 Oct 2006 18:59:13 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/12 18:59:13
Modified files:
gui : sdl.cpp
Log message:
Fixing #ifdef WIN32...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.34&r2=1.35
Patches:
Index: sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- sdl.cpp 12 Oct 2006 18:55:09 -0000 1.34
+++ sdl.cpp 12 Oct 2006 18:59:13 -0000 1.35
@@ -35,7 +35,7 @@
//
//
-/* $Id: sdl.cpp,v 1.34 2006/10/12 18:55:09 nihilus Exp $ */
+/* $Id: sdl.cpp,v 1.35 2006/10/12 18:59:13 nihilus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -62,35 +62,17 @@
#include "log.h"
#include "sdlsup.h"
-#ifdef RENDERER_CAIRO
-#include "render_handler_cairo.h"
-#endif // RENDERER_CAIRO
-
-#ifdef RENDERER_OPENGL
-
#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
-#include "tu_opengl_includes.h"
+#ifdef RENDERER_CAIRO
+ #include "render_handler_cairo.h"
+#endif // RENDERER_CAIRO
+
+#ifdef RENDERER_OPENGL
+ #include "tu_opengl_includes.h"
#endif // RENDERER_OPENGL
using namespace std;
- [Gnash-commit] gnash/gui sdl.cpp,
Markus Gothe <=