[Gnash-commit] gnash configure.ac ChangeLog libbase/container....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/06/07 04:28:46

Modified files:
        .              : configure.ac ChangeLog 
        libbase        : container.h curl_adapter.cpp curl_adapter.h 
                         log.cpp log.h ogl.h tu_opengl_includes.h 
                         tu_timer.cpp tu_types.h utility.h 
Added files:
        libbase        : getopt.c 

Log message:
                * configure.ac: Add config dir for compat files like
                getopt.c. Look for getopt, and replace it if it doesn't exist.
                * backend/gnash.cpp: Remove getopt code for win32, it's in it's
                own file now.
                * libbase/container.h: Look for _WIN32 as well as just WIN32. 
                * libbase/curl_adapter.cpp: Look for _WIN32 as well as just 
WIN32. 
                * libbase/log.cpp: Look for _WIN32 as well as just WIN32. 
                * libbase/log.h: Look for _WIN32 as well as just WIN32. 
                * libbase/tu_types.h: Look for _WIN32 as well as just WIN32. 
                * libbase/utility.h: Look for _WIN32 as well as just WIN32. 
                * libbase/tu_timer.h: Look for _WIN32 as well as just WIN32. 
                * libbase/tu_opengl_includes.h: Look for _WIN32 as well as just
                WIN32.
                * libbase/getopt.c: Replacement function for win32.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.392&r2=1.393
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/ogl.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_opengl_includes.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/getopt.c?cvsroot=gnash&rev=1.1

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- configure.ac        29 May 2006 14:22:05 -0000      1.83
+++ configure.ac        7 Jun 2006 04:28:46 -0000       1.84
@@ -36,6 +36,7 @@
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1)
 AC_CONFIG_SRCDIR(server/gnash.h)
+AC_CONFIG_LIBOBJ_DIR(libbase)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_TARGET
@@ -306,6 +307,8 @@
   AC_DEFINE(HAVE_ISFINITE, [], [Has isfinite])
 fi
 
+AC_REPLACE_FUNCS(getopt)
+
 AC_CHECK_FUNCS(sysconf)
 AC_CHECK_FUNCS(shmget)
 AC_CHECK_FUNCS(shmat)

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -b -r1.392 -r1.393
--- ChangeLog   7 Jun 2006 03:03:21 -0000       1.392
+++ ChangeLog   7 Jun 2006 04:28:46 -0000       1.393
@@ -1,5 +1,20 @@
 2006-06-07 Rob Savoye <address@hidden>
 
+       * configure.ac: Add config dir for compat files like
+       getopt.c. Look for getopt, and replace it if it doesn't exist.
+       * backend/gnash.cpp: Remove getopt code for win32, it's in it's
+       own file now.
+       * libbase/container.h: Look for _WIN32 as well as just WIN32. 
+       * libbase/curl_adapter.cpp: Look for _WIN32 as well as just WIN32. 
+       * libbase/log.cpp: Look for _WIN32 as well as just WIN32. 
+       * libbase/log.h: Look for _WIN32 as well as just WIN32. 
+       * libbase/tu_types.h: Look for _WIN32 as well as just WIN32. 
+       * libbase/utility.h: Look for _WIN32 as well as just WIN32. 
+       * libbase/tu_timer.h: Look for _WIN32 as well as just WIN32. 
+       * libbase/tu_opengl_includes.h: Look for _WIN32 as well as just
+       WIN32.
+       * libbase/getopt.c: Replacement function for win32.
+       
        * backend/gnash.cpp: Load config file, and use those values if
        they exist. Command line options override config file settings.
        * backend/gtksup.cpp: Trap the shift and control modifier keys

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/container.h 25 May 2006 12:33:40 -0000      1.14
+++ libbase/container.h 7 Jun 2006 04:28:46 -0000       1.15
@@ -114,7 +114,7 @@
 //#define StlFree(ptr, size) free(ptr)
 
 // Vitaly: hash from gameSWF. There are compiler problems with stdext:hash in 
Visual C
-#ifdef WIN32
+#if defined(_WIN32) || defined(WIN32)
 
 template<class T, class U, class hash_functor = fixed_size_hash<T> >
 class hash {
@@ -678,7 +678,7 @@
 //
 
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(WIN32)
 #pragma warning(disable : 4345)        // in MSVC 7.1, warning about placement 
new POD default initializer
 #endif // _WIN32
 

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/curl_adapter.cpp    1 Jun 2006 07:28:25 -0000       1.6
+++ libbase/curl_adapter.cpp    7 Jun 2006 04:28:46 -0000       1.7
@@ -34,8 +34,8 @@
 // forward this exception.
 // 
 
-#ifdef WIN32
-#      define snprintf _snprintf
+#if defined(_WIN32) || defined(WIN32)
+#define snprintf _snprintf
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -78,7 +78,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifndef WIN32
+#if !defined(_WIN32) && !defined(WIN32)
 #      include <unistd.h>
 #endif
 

Index: libbase/curl_adapter.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/curl_adapter.h      12 May 2006 20:56:46 -0000      1.1
+++ libbase/curl_adapter.h      7 Jun 2006 04:28:46 -0000       1.2
@@ -39,7 +39,6 @@
 #ifndef CURL_ADAPTER_H
 #define CURL_ADAPTER_H
 
-
 #include "tu_config.h"
 
 #include <string>
@@ -51,23 +50,20 @@
 /// Code to wrap libcurl around a tu_file stream.
 namespace curl_adapter
 {
-       /// \brief
-       /// Returns a read-only tu_file stream that fetches data
-       /// from an url.
-       //
-       /// The caller owns the returned tu_file*.  
-       ///
-       tu_file* make_stream(const char* url);
 
-}
+/// \brief
+/// Returns a read-only tu_file stream that fetches data
+/// from an url.
+//
+/// The caller owns the returned tu_file*.  
+///
+tu_file* make_stream(const char* url);
 
+}
 
 #endif // CURL_ADAPTER_H
 
-
 // Local Variables:
 // mode: C++
-// c-basic-offset: 8 
-// tab-width: 8
 // indent-tabs-mode: t
 // End:

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/log.cpp     7 Jun 2006 03:03:22 -0000       1.9
+++ libbase/log.cpp     7 Jun 2006 04:28:46 -0000       1.10
@@ -48,7 +48,10 @@
 #include <string>
 #include <cstring>
 
-#ifndef WIN32
+#if defined(_WIN32) && defined(WIN32)
+// Required for SYSTEMTIME definitions
+# include <windows.h>
+#else
 #      include <unistd.h>
 #endif
 
@@ -61,11 +64,6 @@
 #include "log.h"
 #include "gnash.h"
 
-// Required for SYSTEMTIME definitions
-#ifdef _WIN32
-#include <windows.h>
-#endif // _WIN32
-
 #include <time.h>
 
 using namespace std;

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/log.h       7 Jun 2006 03:03:22 -0000       1.8
+++ libbase/log.h       7 Jun 2006 04:28:46 -0000       1.9
@@ -168,7 +168,7 @@
 unsigned char *hexify(unsigned char *p, const unsigned char *s, int length);
 
 // Printf-style interfaces.
-#ifdef WIN32
+#if defined(_WIN32) || defined(WIN32)
 void log_msg(const char* fmt, ...);
 void log_error(const char* fmt, ...);
 void log_warning(const char* fmt, ...);
@@ -186,9 +186,6 @@
 
 extern LogFile dbglogfile;
 
-// #define IF_VERBOSE_ACTION(exp) log_action(exp);
-// #define IF_VERBOSE_PARSE(exp)  log_parse(exp);
-
 struct __Host_Function_Report__ {
     const char *func;
 

Index: libbase/ogl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/ogl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/ogl.h       20 Dec 2005 20:57:00 -0000      1.1
+++ libbase/ogl.h       7 Jun 2006 04:28:46 -0000       1.2
@@ -11,38 +11,39 @@
 #include "tu_config.h"
 #include "tu_opengl_includes.h"
 
-namespace ogl {
-       void    open();
-       void    close();
-
-       // Return true if the specified extension is available.
-       bool    check_extension(const char* extension);
-
-       // Return GL_CLAMP, or GL_CLAMP_TO_EDGE_EXT, depending on
-       // which is available.  I pretty much always want the
-       // GL_CLAMP_TO_EDGE_EXT behavior, but it's not in the OpenGL
-       // 1.1 standard, so in those cases I must fall back to
-       // GL_CLAMP.
-       int     get_clamp_mode();
-
-       // For allocating DMA or video memory, for holding vertex arrays.
-       void*   allocate_vertex_memory( int size );     // @@ add a flag for 
selecting AGP vs. video mem?
-       void    free_vertex_memory( void* buffer );
-
-       // Fences; for synchronizing with the GPU.
-       void    gen_fences(int count, unsigned int* fence_array);
-       void    set_fence(unsigned int fence_id);
-       void    finish_fence(unsigned int fence_id);
-
-       // Stream operations; for pushing dynamic vertex data.
-       void*   stream_get_vertex_memory(int size);
-       void    stream_flush_combiners();       // do this after filling your 
buffer, and before calling glDrawElements()
-
-       // Rudimentary multitexture stuff.
-       void    active_texture(int stage);
-       void    client_active_texture(int stage);
-       void    multi_tex_coord_2f(int stage, float s, float t);
-       void    multi_tex_coord_2fv(int stage, float* st);
+namespace ogl
+{
+void   open();
+void   close();
+
+// Return true if the specified extension is available.
+bool   check_extension(const char* extension);
+
+// Return GL_CLAMP, or GL_CLAMP_TO_EDGE_EXT, depending on
+// which is available.  I pretty much always want the
+// GL_CLAMP_TO_EDGE_EXT behavior, but it's not in the OpenGL
+// 1.1 standard, so in those cases I must fall back to
+// GL_CLAMP.
+int    get_clamp_mode();
+
+// For allocating DMA or video memory, for holding vertex arrays.
+void*  allocate_vertex_memory( int size );     // @@ add a flag for selecting 
AGP vs. video mem?
+void   free_vertex_memory( void* buffer );
+
+// Fences; for synchronizing with the GPU.
+void   gen_fences(int count, unsigned int* fence_array);
+void   set_fence(unsigned int fence_id);
+void   finish_fence(unsigned int fence_id);
+
+// Stream operations; for pushing dynamic vertex data.
+void*  stream_get_vertex_memory(int size);
+void   stream_flush_combiners();       // do this after filling your buffer, 
and before calling glDrawElements()
+
+// Rudimentary multitexture stuff.
+void   active_texture(int stage);
+void   client_active_texture(int stage);
+void   multi_tex_coord_2f(int stage, float s, float t);
+void   multi_tex_coord_2fv(int stage, float* st);
 };
 
 
@@ -64,7 +65,5 @@
 
 // Local Variables:
 // mode: C++
-// c-basic-offset: 8 
-// tab-width: 8
 // indent-tabs-mode: t
 // End:

Index: libbase/tu_opengl_includes.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_opengl_includes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/tu_opengl_includes.h        20 Dec 2005 20:57:00 -0000      1.1
+++ libbase/tu_opengl_includes.h        7 Jun 2006 04:28:46 -0000       1.2
@@ -14,7 +14,7 @@
 // WIN32 includes.  We don't want to have to include windows.h because
 // it's such a pig, so #define a couple things that are required to
 // make the gl.h stuff work.
-#ifdef WIN32
+#if defined(_WIN32) || defined(WIN32)
 #      ifndef _INC_WINDOWS
 
 #              define WINAPI   __stdcall
@@ -83,7 +83,5 @@
 
 // Local Variables:
 // mode: C++
-// c-basic-offset: 8 
-// tab-width: 8
 // indent-tabs-mode: t
 // End:

Index: libbase/tu_timer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/tu_timer.cpp        26 Feb 2006 15:49:30 -0000      1.2
+++ libbase/tu_timer.cpp        7 Jun 2006 04:28:46 -0000       1.3
@@ -9,7 +9,7 @@
 #include "tu_timer.h"
 
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(WIN32)
 
 #include <windows.h>
 

Index: libbase/tu_types.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/tu_types.h  29 May 2006 15:07:20 -0000      1.9
+++ libbase/tu_types.h  7 Jun 2006 04:28:46 -0000       1.10
@@ -45,15 +45,15 @@
 #include "tu_config.h"
 #include <stdio.h>
 
-#ifdef WIN32
-       typedef unsigned char uint8_t;
-       typedef char int8_t;
-       typedef unsigned short int uint16_t;
-       typedef short int int16_t;
-       typedef unsigned int uint32_t;
-       typedef int int32_t;
-       typedef unsigned __int64 uint64_t;
-       typedef __int64 int64_t;
+#if defined(_WIN32) || defined(WIN32)
+typedef unsigned char uint8_t;
+typedef char int8_t;
+typedef unsigned short int uint16_t;
+typedef short int int16_t;
+typedef unsigned int uint32_t;
+typedef int int32_t;
+typedef unsigned __int64 uint64_t;
+typedef __int64 int64_t;
 #      define __PRETTY_FUNCTION__ __FUNCDNAME__
 #      define BYTE_ORDER SDL_BYTEORDER
 #else
@@ -92,13 +92,10 @@
 // A function to run some validation checks.
 bool   tu_types_validate();
 
-
 #endif // TU_TYPES_H
 
 
 // Local Variables:
 // mode: C++
-// c-basic-offset: 8 
-// tab-width: 8
 // indent-tabs-mode: t
 // End:

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/utility.h   6 Mar 2006 01:43:26 -0000       1.3
+++ libbase/utility.h   7 Jun 2006 04:28:46 -0000       1.4
@@ -17,7 +17,7 @@
 #include <ctype.h>
 
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(WIN32)
 #ifndef NDEBUG
 
 // On windows, replace ANSI assert with our own, for a less annoying

Index: libbase/getopt.c
===================================================================
RCS file: libbase/getopt.c
diff -N libbase/getopt.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libbase/getopt.c    7 Jun 2006 04:28:46 -0000       1.1
@@ -0,0 +1,79 @@
+/* WIN32 includes.  We don't want to have to include windows.h because
+ * it's such a pig, so #define a couple things that are required to
+ * make the gl.h stuff work.
+ */
+
+#ifndef _INC_WINDOWS
+
+# define WINAPI        __stdcall
+# define APIENTRY WINAPI
+# define CALLBACK __stdcall
+# define DECLSPEC_IMPORT __declspec(dllimport)
+
+# if !defined(_GDI32_)
+#   define WINGDIAPI DECLSPEC_IMPORT
+# else
+#   define WINGDIAPI
+# endif
+
+#else
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
+#ifndef _WCHAR_T_DEFINED
+     typedef unsigned short wchar_t;
+#    define _WCHAR_T_DEFINED
+#endif
+
+#include <string.h>
+
+static int optind = 1;
+static char *optarg;
+static int optopt;
+
+int
+getopt(int argc, char * const argv[], char *optstring)
+{
+  static int sp = 1;
+  register int c;
+  register char *cp;
+  
+  if (sp == 1) {
+    if (optind >= argc || argv[optind][0] != '-' || argv[optind][1] == '\0') {
+      return (-1);
+    } else
+      if (strcmp(argv[optind], "--") == 0) {
+        optind++;
+        return (-1);
+      }
+  }
+  optopt = c = argv[optind][sp];
+  if (c == ':' || (cp = strchr(optstring, c)) == NULL) {
+    if (argv[optind][++sp] == '\0') {
+      optind++;
+      sp = 1;
+    }
+    return ('?');
+  }
+  if (*++cp == ':') {
+    if (argv[optind][sp + 1] != '\0') {
+      optarg = &argv[optind++][sp + 1];
+    } else
+      if (++optind >= argc) {
+        sp = 1;
+        return ('?');
+      } else {
+        optarg = argv[optind++];
+        sp = 1;
+      }
+  } else {
+    if (argv[optind][++sp] == '\0') {
+      sp = 1;
+      optind++;
+    }
+    optarg = NULL;
+  }
+  return (c);
+}
+