[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 19:08:26 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/12 19:08:26
Modified files:
gui : sdl.cpp
Log message:
Cleanup.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.35&r2=1.36
Patches:
Index: sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- sdl.cpp 12 Oct 2006 18:59:13 -0000 1.35
+++ sdl.cpp 12 Oct 2006 19:08:26 -0000 1.36
@@ -35,14 +35,19 @@
//
//
-/* $Id: sdl.cpp,v 1.35 2006/10/12 18:59:13 nihilus Exp $ */
+/* $Id: sdl.cpp,v 1.36 2006/10/12 19:08:26 nihilus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <cstdio>
-#include <unistd.h>
+
+#if defined(_WIN32) || defined(WIN32)
+ #define basename(x) x
+ #include "getopt_win32.h"
+#else
+ #include <unistd.h>
#ifndef __THROW
# ifndef __GNUC_PREREQ
@@ -55,18 +60,15 @@
# endif
#endif
-extern int getopt(int, char *const *, const char *) __THROW;
+ extern int getopt(int, char *const *, const char *) __THROW;
+ #include <libgen.h> //For POSIX basename().
+
+#endif // Win32
-#include <libgen.h> //For POSIX basename().
#include "gnash.h"
#include "log.h"
#include "sdlsup.h"
-#if defined(_WIN32) || defined(WIN32)
-# define basename(x) x
-# include "getopt_win32.h"
-#endif
-
#ifdef RENDERER_CAIRO
#include "render_handler_cairo.h"
#endif // RENDERER_CAIRO