[Gnash-commit] /srv/bzr/gnash/trunk r9608: Include pthread.h, so it'll compile on the latest OpenBSD

[rob]

------------------------------------------------------------
revno: 9608
committer: address@hidden
branch nick: trunk
timestamp: Fri 2008-08-15 22:18:01 -0600
message:
  Include pthread.h, so it'll compile on the latest OpenBSD
modified:
  backend/render_handler_agg.cpp
  libbase/GnashImage.h
  libbase/GnashImageGif.cpp
  libbase/GnashImageJpeg.cpp
  libbase/GnashImagePng.cpp
  libbase/curl_adapter.cpp
  libbase/noseek_fd_adapter.cpp
  libbase/tu_file.cpp
  libbase/utility.h
  libcore/CharacterProxy.cpp
  libcore/StreamProvider.cpp
  libcore/asobj/xmlsocket.cpp
  libcore/fontlib.cpp
  libcore/matrix.cpp
  libcore/swf/PlaceObject2Tag.cpp
  libcore/swf/tag_loaders.cpp
  libcore/text.cpp
  libmedia/MediaParser.cpp
  libnet/network.cpp

=== modified file 'backend/render_handler_agg.cpp'
--- a/backend/render_handler_agg.cpp    2008-08-14 09:03:58 +0000
+++ b/backend/render_handler_agg.cpp    2008-08-16 04:18:01 +0000
@@ -116,6 +116,9 @@
 #include "gnashconfig.h"
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
 
 #include <vector>
 #include <cmath>

=== modified file 'libbase/GnashImage.h'
--- a/libbase/GnashImage.h      2008-08-14 09:52:07 +0000
+++ b/libbase/GnashImage.h      2008-08-16 04:18:01 +0000
@@ -20,6 +20,13 @@
 #ifndef GNASH_GNASHIMAGE_H
 #define GNASH_GNASHIMAGE_H
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
 #include <boost/shared_ptr.hpp> 
 #include "log.h"
 #include "image.h"

=== modified file 'libbase/GnashImageGif.cpp'
--- a/libbase/GnashImageGif.cpp 2008-08-14 09:52:07 +0000
+++ b/libbase/GnashImageGif.cpp 2008-08-16 04:18:01 +0000
@@ -17,6 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "utility.h"
 #include "GnashImageGif.h"
 #include "log.h"

=== modified file 'libbase/GnashImageJpeg.cpp'
--- a/libbase/GnashImageJpeg.cpp        2008-08-14 09:52:07 +0000
+++ b/libbase/GnashImageJpeg.cpp        2008-08-16 04:18:01 +0000
@@ -22,6 +22,13 @@
 // Wrapper for jpeg file operations.  The actual work is done by the
 // IJG jpeg lib.
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
 
 #include "utility.h"
 #include "GnashImage.h"

=== modified file 'libbase/GnashImagePng.cpp'
--- a/libbase/GnashImagePng.cpp 2008-08-14 09:52:07 +0000
+++ b/libbase/GnashImagePng.cpp 2008-08-16 04:18:01 +0000
@@ -17,6 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "utility.h"
 #include "GnashImagePng.h"
 #include "log.h"

=== modified file 'libbase/curl_adapter.cpp'
--- a/libbase/curl_adapter.cpp  2008-08-12 12:58:45 +0000
+++ b/libbase/curl_adapter.cpp  2008-08-16 04:18:01 +0000
@@ -17,11 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "utility.h" // UNUSED macro
 #include "IOChannel.h"
 #include "curl_adapter.h"

=== modified file 'libbase/noseek_fd_adapter.cpp'
--- a/libbase/noseek_fd_adapter.cpp     2008-08-07 10:02:35 +0000
+++ b/libbase/noseek_fd_adapter.cpp     2008-08-16 04:18:01 +0000
@@ -19,6 +19,10 @@
 #include "gnashconfig.h"
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "noseek_fd_adapter.h"
 #include "IOChannel.h" // for inheritance
 #include "utility.h"

=== modified file 'libbase/tu_file.cpp'
--- a/libbase/tu_file.cpp       2008-06-09 18:08:25 +0000
+++ b/libbase/tu_file.cpp       2008-08-16 04:18:01 +0000
@@ -5,6 +5,13 @@
 
 // A file class that can be customized with callbacks.
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
 
 #include "tu_file.h"
 #include "utility.h"

=== modified file 'libbase/utility.h'
--- a/libbase/utility.h 2008-07-29 22:26:53 +0000
+++ b/libbase/utility.h 2008-08-16 04:18:01 +0000
@@ -22,7 +22,9 @@
 #define UTILITY_H
 
 // HAVE_FINITE, HAVE_PTHREADS, WIN32, NDEBUG etc.
+#ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
+#endif
 
 #include <cassert>
 #include <cctype>

=== modified file 'libcore/CharacterProxy.cpp'
--- a/libcore/CharacterProxy.cpp        2008-06-17 09:04:12 +0000
+++ b/libcore/CharacterProxy.cpp        2008-08-16 04:18:01 +0000
@@ -17,6 +17,13 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
 
 #include "CharacterProxy.h"
 

=== modified file 'libcore/StreamProvider.cpp'
--- a/libcore/StreamProvider.cpp        2008-06-09 13:31:51 +0000
+++ b/libcore/StreamProvider.cpp        2008-08-16 04:18:01 +0000
@@ -21,6 +21,11 @@
 #include "gnashconfig.h"
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
+
 #include "StreamProvider.h"
 #include "URL.h"
 #include "tu_file.h"

=== modified file 'libcore/asobj/xmlsocket.cpp'
--- a/libcore/asobj/xmlsocket.cpp       2008-07-31 15:09:32 +0000
+++ b/libcore/asobj/xmlsocket.cpp       2008-08-16 04:18:01 +0000
@@ -21,6 +21,10 @@
 #include "gnashconfig.h"
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "network.h"
 #include "utility.h"
 #include "xml.h"

=== modified file 'libcore/fontlib.cpp'
--- a/libcore/fontlib.cpp       2008-07-22 17:08:40 +0000
+++ b/libcore/fontlib.cpp       2008-08-16 04:18:01 +0000
@@ -5,6 +5,13 @@
 
 // A module to take care of all of gnash's loaded fonts.
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
 
 #include "tu_file.h"
 #include "font.h"

=== modified file 'libcore/matrix.cpp'
--- a/libcore/matrix.cpp        2008-08-12 15:54:32 +0000
+++ b/libcore/matrix.cpp        2008-08-16 04:18:01 +0000
@@ -25,6 +25,10 @@
 #include "gnashconfig.h"
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "matrix.h"
 #include "SWFStream.h" // for reading from SWF
 #include "log.h"

=== modified file 'libcore/swf/PlaceObject2Tag.cpp'
--- a/libcore/swf/PlaceObject2Tag.cpp   2008-08-12 15:54:32 +0000
+++ b/libcore/swf/PlaceObject2Tag.cpp   2008-08-16 04:18:01 +0000
@@ -17,6 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "PlaceObject2Tag.h"
 #include "character.h"
 #include "sprite_instance.h"

=== modified file 'libcore/swf/tag_loaders.cpp'
--- a/libcore/swf/tag_loaders.cpp       2008-08-14 09:03:58 +0000
+++ b/libcore/swf/tag_loaders.cpp       2008-08-16 04:18:01 +0000
@@ -22,6 +22,10 @@
 #include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "tu_file.h" // for StreamAdapter (bitmap tag loaders)
 #include "utility.h"
 #include "action.h"

=== modified file 'libcore/text.cpp'
--- a/libcore/text.cpp  2008-08-10 17:08:19 +0000
+++ b/libcore/text.cpp  2008-08-16 04:18:01 +0000
@@ -19,6 +19,13 @@
 
 
 // Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
+#endif
+
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
 
 #include "utf8.h"
 #include "utility.h"

=== modified file 'libmedia/MediaParser.cpp'
--- a/libmedia/MediaParser.cpp  2008-07-29 22:26:53 +0000
+++ b/libmedia/MediaParser.cpp  2008-08-16 04:18:01 +0000
@@ -21,6 +21,7 @@
 #include "MediaParser.h"
 #include "log.h"
 
+#include <unistd.h>             // for usleep()
 #include <boost/bind.hpp>
 
 #ifdef _WIN32

=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp        2008-08-14 04:24:41 +0000
+++ b/libnet/network.cpp        2008-08-16 04:18:01 +0000
@@ -20,6 +20,10 @@
 #include "gnashconfig.h"
 #endif
 
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
 #include "utility.h"
 #include "log.h"
 #include "network.h"