[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog utilities/parser.cpp utilities/...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog utilities/parser.cpp utilities/... |
Date: |
Wed, 18 Oct 2006 11:29:09 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/10/18 11:29:09
Modified files:
. : ChangeLog
utilities : parser.cpp processor.cpp
Log message:
don't redeclare geopt stuff is getopt.h is available.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1285&r2=1.1286
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.27&r2=1.28
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1285
retrieving revision 1.1286
diff -u -b -r1.1285 -r1.1286
--- ChangeLog 18 Oct 2006 11:16:56 -0000 1.1285
+++ ChangeLog 18 Oct 2006 11:29:08 -0000 1.1286
@@ -1,8 +1,8 @@
2006-10-18 Sandro Santilli <address@hidden>
* configure.ac: check for getopt.h
- * gui/gnash.cpp: don't redeclare geopt stuff is getopt.h
- is available.
+ * gui/gnash.cpp, utilities/: parser.cpp, processor.cpp:
+ don't redeclare geopt stuff is getopt.h is available.
* macros/sdl.m4: fixed typo ("$/" => "$i/")
2006-10-18 Bastiaan Jacques <address@hidden>
Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- utilities/parser.cpp 17 Oct 2006 22:33:03 -0000 1.22
+++ utilities/parser.cpp 18 Oct 2006 11:29:08 -0000 1.23
@@ -36,7 +36,7 @@
// carries forward this exception.
//
-/* $Id: parser.cpp,v 1.22 2006/10/17 22:33:03 nihilus Exp $ */
+/* $Id: parser.cpp,v 1.23 2006/10/18 11:29:08 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -47,7 +47,11 @@
extern "C"{
#include <unistd.h>
+#ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+#else
extern int optind, getopt(int, char *const *, const char *);
+#endif
}
#include "tu_file.h"
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- utilities/processor.cpp 17 Oct 2006 22:29:51 -0000 1.27
+++ utilities/processor.cpp 18 Oct 2006 11:29:09 -0000 1.28
@@ -37,7 +37,7 @@
//
//
-/* $Id: processor.cpp,v 1.27 2006/10/17 22:29:51 nihilus Exp $ */
+/* $Id: processor.cpp,v 1.28 2006/10/18 11:29:09 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -58,7 +58,11 @@
#include <cstdio>
extern "C"{
#include <unistd.h>
+#ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+#else
extern int optind, getopt(int, char *const *, const char *);
+#endif
}
bool gofast = false; // FIXME: this flag gets set based on
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog utilities/parser.cpp utilities/...,
Sandro Santilli <=