[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog utilities/parser.cpp utilities/...
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog utilities/parser.cpp utilities/... |
Date: |
Fri, 29 Sep 2006 01:39:51 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/09/29 01:39:51
Modified files:
. : ChangeLog
utilities : parser.cpp processor.cpp
Log message:
Fixed definition of getopt() to compile with -pedantic in gcc.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.958&r2=1.959
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.20&r2=1.21
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.958
retrieving revision 1.959
diff -u -b -r1.958 -r1.959
--- ChangeLog 29 Sep 2006 01:33:21 -0000 1.958
+++ ChangeLog 29 Sep 2006 01:39:51 -0000 1.959
@@ -4,6 +4,8 @@
* libamf/amf.h: comma at end of enumerator list.
* server/parser/action_buffer.cpp, server/ActionExec.cpp,
server/fontlib.cpp, server/swf/ASHandlers.cpp: %zd -> %lu.
+ * utilities/parser.cpp, utilities/processor.cpp: Fixed definition of
+ getopt() to compile with -pedantic in gcc.
2006-09-28 Markus Gothe <address@hidden>
Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- utilities/parser.cpp 30 Aug 2006 17:10:09 -0000 1.17
+++ utilities/parser.cpp 29 Sep 2006 01:39:51 -0000 1.18
@@ -43,7 +43,19 @@
#include <iostream>
#include <cstdio>
#include <unistd.h>
-extern int optind, getopt(int, char *const *, const char *);
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+# define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+# define __THROW throw ()
+# else
+# define __THROW
+# endif
+#endif
+
+extern int optind, getopt(int, char *const *, const char *) __THROW;
#include "tu_file.h"
#include "zlib_adapter.h"
#include "image.h"
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- utilities/processor.cpp 18 Sep 2006 05:10:16 -0000 1.20
+++ utilities/processor.cpp 29 Sep 2006 01:39:51 -0000 1.21
@@ -55,7 +55,20 @@
#include <iostream>
#include <cstdio>
#include <unistd.h>
-extern int optind, getopt(int, char *const *, const char *);
+
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+# define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+# define __THROW throw ()
+# else
+# define __THROW
+# endif
+#endif
+
+extern int optind, getopt(int, char *const *, const char *) __THROW;
bool gofast = false; // FIXME: this flag gets set based on
// an XML message written using