[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash gui/sdl.cpp ChangeLog
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash gui/sdl.cpp ChangeLog |
Date: |
Wed, 18 Oct 2006 11:31:20 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/10/18 11:31:20
Modified files:
gui : sdl.cpp
. : ChangeLog
Log message:
don't redeclare geopt stuff is getopt.h is available.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1286&r2=1.1287
Patches:
Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- gui/sdl.cpp 17 Oct 2006 22:29:51 -0000 1.44
+++ gui/sdl.cpp 18 Oct 2006 11:31:20 -0000 1.45
@@ -35,7 +35,7 @@
//
//
-/* $Id: sdl.cpp,v 1.44 2006/10/17 22:29:51 nihilus Exp $ */
+/* $Id: sdl.cpp,v 1.45 2006/10/18 11:31:20 strk 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
@@ -51,8 +51,12 @@
#include "getopt_win32.h"
#else
extern "C"{
+#ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+#else
#include <unistd.h>
extern int getopt(int, char *const *, const char *);
+#endif
}
#endif // Win32
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -b -r1.1286 -r1.1287
--- ChangeLog 18 Oct 2006 11:29:08 -0000 1.1286
+++ ChangeLog 18 Oct 2006 11:31:20 -0000 1.1287
@@ -1,7 +1,8 @@
2006-10-18 Sandro Santilli <address@hidden>
* configure.ac: check for getopt.h
- * gui/gnash.cpp, utilities/: parser.cpp, processor.cpp:
+ * gui/: gnash.cpp, sdl.cpp,
+ utilities/: parser.cpp, processor.cpp:
don't redeclare geopt stuff is getopt.h is available.
* macros/sdl.m4: fixed typo ("$/" => "$i/")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash gui/sdl.cpp ChangeLog,
Sandro Santilli <=