[Gnash-commit] gnash ChangeLog configure.ac gui/kde_glue.h gui...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/10/18 10:34:03

Modified files:
        .              : ChangeLog configure.ac 
        gui            : kde_glue.h kde_glue_opengl.cpp 
        libbase        : log.h 

Log message:
                * configure.ac: Have configure export SIZEOF defines for various
                integer types.
                * libbase/log.h: Define SIZEOF_SIZE_T based on the size of its
                integer type definition, so as to avoid warnings caused by 
integer
                size difference variations in platforms.
                * gui/kde_glue.h: Remove OpenGL include.
                * gui/kde_opengl_glue.cpp: Add OpenGL include.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1281&r2=1.1282
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.169&r2=1.170
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue_opengl.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -b -r1.1281 -r1.1282
--- ChangeLog   18 Oct 2006 10:31:32 -0000      1.1281
+++ ChangeLog   18 Oct 2006 10:34:02 -0000      1.1282
@@ -1,3 +1,13 @@
+2006-10-18 Bastiaan Jacques <address@hidden>
+
+       * configure.ac: Have configure export SIZEOF defines for various
+       integer types.
+       * libbase/log.h: Define SIZEOF_SIZE_T based on the size of its
+       integer type definition, so as to avoid warnings caused by integer
+       size difference variations in platforms.
+       * gui/kde_glue.h: Remove OpenGL include.
+       * gui/kde_opengl_glue.cpp: Add OpenGL include.
+
 2006-10-18 Sandro Santilli <address@hidden>
 
        * server/rect.cpp (expand_to_transformed_rect): do nothing

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- configure.ac        18 Oct 2006 07:42:36 -0000      1.169
+++ configure.ac        18 Oct 2006 10:34:02 -0000      1.170
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.169 2006/10/18 07:42:36 bik Exp $
+dnl $Id: configure.ac,v 1.170 2006/10/18 10:34:02 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -491,6 +491,10 @@
 dnl
 
 AC_CHECK_SIZEOF(size_t) dnl set SIZEOF_SIZE_T.
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(long long)
 
 if test x$gui = xkde -o x$klash = xyes ; then
 KDE_SET_PREFIX

Index: gui/kde_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gui/kde_glue.h      16 Oct 2006 12:25:07 -0000      1.4
+++ gui/kde_glue.h      18 Oct 2006 10:34:02 -0000      1.5
@@ -36,12 +36,10 @@
 //
 
 
-/* $Id: kde_glue.h,v 1.4 2006/10/16 12:25:07 bjacques Exp $ */
+/* $Id: kde_glue.h,v 1.5 2006/10/18 10:34:02 bjacques Exp $ */
 
 #include "gnash.h"
 
-#include "tu_opengl_includes.h"
-
 #include <qwidget.h>
 
 namespace gnash

Index: gui/kde_glue_opengl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue_opengl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gui/kde_glue_opengl.cpp     16 Oct 2006 12:25:07 -0000      1.6
+++ gui/kde_glue_opengl.cpp     18 Oct 2006 10:34:03 -0000      1.7
@@ -35,10 +35,10 @@
 //
 //
 
-/* $Id: kde_glue_opengl.cpp,v 1.6 2006/10/16 12:25:07 bjacques Exp $ */
+/* $Id: kde_glue_opengl.cpp,v 1.7 2006/10/18 10:34:03 bjacques Exp $ */
 
 #include "kde_glue_opengl.h"
-//#include "log.h"
+#include "tu_opengl_includes.h"
 
 using namespace std;
 

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- libbase/log.h       7 Oct 2006 19:59:14 -0000       1.26
+++ libbase/log.h       18 Oct 2006 10:34:03 -0000      1.27
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: log.h,v 1.26 2006/10/07 19:59:14 nihilus Exp $ */
+/* $Id: log.h,v 1.27 2006/10/18 10:34:03 bjacques Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -52,12 +52,14 @@
 #define TIMESTAMP_LENGTH 24             // timestamp length
 #define TIMESTAMP_FORMAT "%Y-%m-%d %H:%M:%S     " // timestamp format
 
-#if SIZEOF_SIZE_T == 8
-  #define SIZET_FMT "%lu"
-#elif SIZEOF_SIZE_T == 4
-  #define SIZET_FMT "%u"
-#else
-  #define SIZET_FMT "%z"
+#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+  #define SIZET_FMT "%lld"
+#elif SIZEOF_SIZE_T == SIZEOF_LONG
+  #define SIZET_FMT "%ld"
+#elif SIZEOF_SIZE_T == SIZEOF_INT
+  #define SIZET_FMT "%d"
+#elif SIZEOF_SIZE_T == SIZEOF_SHORT
+  #define SIZET_FMT "%hd"
 #endif
 
 namespace gnash {