[Gnash-commit] gnash/libbase getopt_win32.cpp getopt_win32.h

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/09/27 08:45:02

Modified files:
        libbase        : getopt_win32.cpp getopt_win32.h 

Log message:
        porting to win32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/getopt_win32.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/getopt_win32.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: getopt_win32.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/getopt_win32.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- getopt_win32.cpp    25 Sep 2006 13:24:06 -0000      1.3
+++ getopt_win32.cpp    27 Sep 2006 08:45:01 -0000      1.4
@@ -1,4 +1,4 @@
-/* $Id: getopt_win32.cpp,v 1.3 2006/09/25 13:24:06 nihilus Exp $ */
+/* $Id: getopt_win32.cpp,v 1.4 2006/09/27 08:45:01 alexeev Exp $ */
 
 #ifdef __cplusplus
 extern "C"
@@ -11,7 +11,7 @@
   char *optarg;                        // global argument pointer
   int optind = 0;              // global argv index
 
-  int getopt (int argc, char *argv[], char *optstring)
+       int getopt (int argc, char *const argv[], char *optstring)
   {
     char c;
     char *cp;

Index: getopt_win32.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/getopt_win32.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- getopt_win32.h      25 Sep 2006 13:16:44 -0000      1.4
+++ getopt_win32.h      27 Sep 2006 08:45:01 -0000      1.5
@@ -1,12 +1,21 @@
-/* $Id: getopt_win32.h,v 1.4 2006/09/25 13:16:44 nihilus Exp $ */
+/* $Id: getopt_win32.h,v 1.5 2006/09/27 08:45:01 alexeev Exp $ */
 
 #ifndef GETOPT_WIN32_H
 #define GETOPT_WIN32_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 extern int optind;
 extern char *optarg;
 extern int optopt;
 
 int getopt (int argc, char *const argv[], char *optstring);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* GETOPT_WIN32_H */