[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10276: libbase/utility.h: Stop incl
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10276: libbase/utility.h: Stop including pthread.h inside namespace gnash, |
Date: |
Fri, 14 Nov 2008 01:46:35 +0100 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10276
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Fri 2008-11-14 01:46:35 +0100
message:
libbase/utility.h: Stop including pthread.h inside namespace gnash,
because this confuses platforms such as OpenBSD. We can now stop
including pthread.h all over the place, which was a workaround
for the former.
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/RGBA.cpp
libcore/SWFMatrix.cpp
libcore/StreamProvider.cpp
libcore/asobj/XMLSocket_as.cpp
libcore/fontlib.cpp
libcore/swf/PlaceObject2Tag.cpp
libcore/swf/tag_loaders.cpp
=== modified file 'backend/render_handler_agg.cpp'
--- a/backend/render_handler_agg.cpp 2008-10-27 16:05:13 +0000
+++ b/backend/render_handler_agg.cpp 2008-11-14 00:46:35 +0000
@@ -116,10 +116,6 @@
#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-10-27 18:46:53 +0000
+++ b/libbase/GnashImage.h 2008-11-14 00:46:35 +0000
@@ -27,9 +27,6 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <boost/cstdint.hpp>
=== modified file 'libbase/GnashImageGif.cpp'
--- a/libbase/GnashImageGif.cpp 2008-08-18 23:53:04 +0000
+++ b/libbase/GnashImageGif.cpp 2008-11-14 00:46:35 +0000
@@ -21,10 +21,6 @@
#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-10-27 16:05:13 +0000
+++ b/libbase/GnashImageJpeg.cpp 2008-11-14 00:46:35 +0000
@@ -26,10 +26,6 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "utility.h"
#include "GnashImage.h"
#include "IOChannel.h"
=== modified file 'libbase/GnashImagePng.cpp'
--- a/libbase/GnashImagePng.cpp 2008-10-27 16:05:13 +0000
+++ b/libbase/GnashImagePng.cpp 2008-11-14 00:46:35 +0000
@@ -21,10 +21,6 @@
#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-11-12 10:33:22 +0000
+++ b/libbase/curl_adapter.cpp 2008-11-14 00:46:35 +0000
@@ -21,14 +21,10 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "NetworkAdapter.h"
#include "utility.h" // UNUSED macro
+#include "log.h"
#include "IOChannel.h"
-#include "log.h"
#include "WallClockTimer.h"
#include "GnashSleep.h"
=== modified file 'libbase/noseek_fd_adapter.cpp'
--- a/libbase/noseek_fd_adapter.cpp 2008-08-18 23:53:04 +0000
+++ b/libbase/noseek_fd_adapter.cpp 2008-11-14 00:46:35 +0000
@@ -19,10 +19,6 @@
#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-08-22 15:11:39 +0000
+++ b/libbase/tu_file.cpp 2008-11-14 00:46:35 +0000
@@ -9,10 +9,6 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "tu_file.h"
#include "utility.h"
#include "log.h"
=== modified file 'libbase/utility.h'
--- a/libbase/utility.h 2008-09-03 15:24:27 +0000
+++ b/libbase/utility.h 2008-11-14 00:46:35 +0000
@@ -16,8 +16,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#ifndef UTILITY_H
-#define UTILITY_H
+#ifndef _GNASH_UTILITY_H
+#define _GNASH_UTILITY_H
// HAVE_FINITE, HAVE_PTHREADS, WIN32, NDEBUG etc.
#ifdef HAVE_CONFIG_H
@@ -32,6 +32,10 @@
#include <algorithm> // std::min, std::max
#include <limits>
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
#if defined(__GNUC__) && __GNUC__ > 2
# include <cxxabi.h>
#endif
@@ -184,7 +188,6 @@
/// Used in logging.
#ifdef HAVE_PTHREADS
-#include <pthread.h>
#else
# ifdef _WIN32
} // end namespace gnash
@@ -223,7 +226,7 @@
// Handy macro to quiet compiler warnings about unused parameters/variables.
#define UNUSED(x) (x) = (x)
-#endif // UTILITY_H
+#endif // _GNASH_UTILITY_H
// Local Variables:
=== modified file 'libcore/CharacterProxy.cpp'
--- a/libcore/CharacterProxy.cpp 2008-08-18 23:53:04 +0000
+++ b/libcore/CharacterProxy.cpp 2008-11-14 00:46:35 +0000
@@ -21,10 +21,6 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "CharacterProxy.h"
#include "utility.h" // for typeName
=== modified file 'libcore/RGBA.cpp'
--- a/libcore/RGBA.cpp 2008-10-20 17:06:14 +0000
+++ b/libcore/RGBA.cpp 2008-11-14 00:46:35 +0000
@@ -3,11 +3,6 @@
// This source code has been donated to the Public Domain. Do
// whatever you want with it.
-// Some basic types for gnash.
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include <boost/thread.hpp>
#include "RGBA.h"
=== modified file 'libcore/SWFMatrix.cpp'
--- a/libcore/SWFMatrix.cpp 2008-10-19 18:04:05 +0000
+++ b/libcore/SWFMatrix.cpp 2008-11-14 00:46:35 +0000
@@ -25,10 +25,6 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "SWFMatrix.h"
#include "SWFStream.h" // for reading from SWF
#include "log.h"
=== modified file 'libcore/StreamProvider.cpp'
--- a/libcore/StreamProvider.cpp 2008-09-25 07:03:10 +0000
+++ b/libcore/StreamProvider.cpp 2008-11-14 00:46:35 +0000
@@ -21,10 +21,6 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "StreamProvider.h"
#include "URL.h"
=== modified file 'libcore/asobj/XMLSocket_as.cpp'
--- a/libcore/asobj/XMLSocket_as.cpp 2008-10-25 15:44:08 +0000
+++ b/libcore/asobj/XMLSocket_as.cpp 2008-11-14 00:46:35 +0000
@@ -21,10 +21,6 @@
#include "gnashconfig.h"
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "network.h"
#include "utility.h"
#include "XML_as.h"
=== modified file 'libcore/fontlib.cpp'
--- a/libcore/fontlib.cpp 2008-11-08 18:03:33 +0000
+++ b/libcore/fontlib.cpp 2008-11-14 00:46:35 +0000
@@ -9,10 +9,6 @@
#include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "Font.h"
#include "impl.h"
#include "log.h"
=== modified file 'libcore/swf/PlaceObject2Tag.cpp'
--- a/libcore/swf/PlaceObject2Tag.cpp 2008-10-30 21:35:10 +0000
+++ b/libcore/swf/PlaceObject2Tag.cpp 2008-11-14 00:46:35 +0000
@@ -21,10 +21,6 @@
#include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "PlaceObject2Tag.h"
#include "character.h"
#include "MovieClip.h"
=== modified file 'libcore/swf/tag_loaders.cpp'
--- a/libcore/swf/tag_loaders.cpp 2008-11-08 22:02:22 +0000
+++ b/libcore/swf/tag_loaders.cpp 2008-11-14 00:46:35 +0000
@@ -22,10 +22,6 @@
#include "gnashconfig.h" // HAVE_ZLIB_H, USE_SWFTREE
#endif
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#include "IOChannel.h" // for StreamAdapter inheritance
#include "utility.h"
#include "action.h"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10276: libbase/utility.h: Stop including pthread.h inside namespace gnash,,
Bastiaan Jacques <=