[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10320: Make a start at rationalizin
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10320: Make a start at rationalizing system header includes. Remove unused file. |
|
Date: |
Fri, 21 Nov 2008 22:15:46 +0100 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10320
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2008-11-21 22:15:46 +0100
message:
Make a start at rationalizing system header includes. Remove unused file.
This may break some builds; every file with read() or write() should include
GnashSystemIOHeaders.h. Missing includes for (only) those functions on a
particular platform should be added to that header file and not put
anywhere else in the code.
removed:
libcore/asobj/xmlattrs.h
added:
libbase/GnashSystemIOHeaders.h
modified:
cygnal/crc.cpp
cygnal/cygnal.cpp
cygnal/stream.cpp
cygnal/testsuite/cygnal.all/test_crc.cpp
extensions/fileio/fileio.cpp
gui/Player.cpp
gui/aqua.cpp
gui/fb.cpp
gui/sdl.cpp
libamf/amftest.cpp
libbase/Makefile.am
libbase/URL.cpp
libbase/noseek_fd_adapter.cpp
libcore/StreamProvider.cpp
libcore/URLAccessManager.cpp
libcore/asobj/LocalConnection.cpp
libcore/asobj/Makefile.am
libcore/asobj/SharedObject.cpp
libcore/asobj/XMLNode_as.h
libcore/asobj/XMLSocket_as.cpp
libcore/asobj/XML_as.cpp
libcore/movie_root.cpp
libcore/parser/SWFMovieDefinition.cpp
libcore/vm/ASHandlers.cpp
libmedia/gst/MediaParserGst.cpp
libnet/http.cpp
libnet/network.cpp
plugin/plugin.cpp
testsuite/libamf.all/test_lc.cpp
testsuite/libamf.all/test_number.cpp
testsuite/libamf.all/test_object.cpp
testsuite/libamf.all/test_string.cpp
testsuite/libamf.all/test_variable.cpp
testsuite/libbase/NoSeekFileTest.cpp
testsuite/libbase/TCXXRc.cpp
testsuite/libcore.all/BitsReaderTest.cpp
testsuite/libcore.all/StreamTest.cpp
testsuite/libnet.all/test_cque.cpp
testsuite/libnet.all/test_crc.cpp
testsuite/libnet.all/test_handler.cpp
testsuite/libnet.all/test_http.cpp
testsuite/misc-ming.all/DragDropTestRunner.cpp
testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
testsuite/misc-ming.all/intervalTestRunner.cpp
testsuite/misc-ming.all/loadMovieTestRunner.cpp
utilities/dumpshm.cpp
utilities/soldumper.cpp
------------------------------------------------------------
revno: 10317.1.1
committer: Benjamin Wolsey <address@hidden>
branch nick: test
timestamp: Fri 2008-11-21 16:15:25 +0100
message:
Remove unused xmlattrs.h.
Handle read() and write() functions using the new GnashSystemIOHeaders.h
Drop MAX_PATH usage and drop some apparently unnecessary includes in
various
files (should help relocating system includes to compatibility headers).
removed:
libcore/asobj/xmlattrs.h
added:
libbase/GnashSystemIOHeaders.h
modified:
cygnal/crc.cpp
cygnal/cygnal.cpp
cygnal/stream.cpp
cygnal/testsuite/cygnal.all/test_crc.cpp
extensions/fileio/fileio.cpp
gui/Player.cpp
gui/aqua.cpp
gui/fb.cpp
gui/sdl.cpp
libamf/amftest.cpp
libbase/Makefile.am
libbase/URL.cpp
libbase/noseek_fd_adapter.cpp
libcore/StreamProvider.cpp
libcore/URLAccessManager.cpp
libcore/asobj/LocalConnection.cpp
libcore/asobj/Makefile.am
libcore/asobj/SharedObject.cpp
libcore/asobj/XMLNode_as.h
libcore/asobj/XMLSocket_as.cpp
libcore/asobj/XML_as.cpp
libcore/movie_root.cpp
libcore/parser/SWFMovieDefinition.cpp
libcore/vm/ASHandlers.cpp
libmedia/gst/MediaParserGst.cpp
libnet/http.cpp
libnet/network.cpp
plugin/plugin.cpp
testsuite/libamf.all/test_lc.cpp
testsuite/libamf.all/test_number.cpp
testsuite/libamf.all/test_object.cpp
testsuite/libamf.all/test_string.cpp
testsuite/libamf.all/test_variable.cpp
testsuite/libbase/NoSeekFileTest.cpp
testsuite/libbase/TCXXRc.cpp
testsuite/libcore.all/BitsReaderTest.cpp
testsuite/libcore.all/StreamTest.cpp
testsuite/libnet.all/test_cque.cpp
testsuite/libnet.all/test_crc.cpp
testsuite/libnet.all/test_handler.cpp
testsuite/libnet.all/test_http.cpp
testsuite/misc-ming.all/DragDropTestRunner.cpp
testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp
testsuite/misc-ming.all/intervalTestRunner.cpp
testsuite/misc-ming.all/loadMovieTestRunner.cpp
utilities/dumpshm.cpp
utilities/soldumper.cpp
=== modified file 'cygnal/crc.cpp'
--- a/cygnal/crc.cpp 2008-09-07 13:30:34 +0000
+++ b/cygnal/crc.cpp 2008-11-21 15:15:25 +0000
@@ -31,7 +31,7 @@
#endif
#include <sys/types.h>
-#include <unistd.h> // for getuid()
+#include "GnashSystemIOHeaders.h" // for getuid()
#include <sys/stat.h>
#include <boost/cstdint.hpp>
=== modified file 'cygnal/cygnal.cpp'
--- a/cygnal/cygnal.cpp 2008-09-09 03:49:35 +0000
+++ b/cygnal/cygnal.cpp 2008-11-21 15:15:25 +0000
@@ -36,7 +36,7 @@
#include "gettext.h"
extern "C"{
-# include <unistd.h>
+# include "GnashSystemIOHeaders.h"
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif
=== modified file 'cygnal/stream.cpp'
--- a/cygnal/stream.cpp 2008-03-18 01:06:03 +0000
+++ b/cygnal/stream.cpp 2008-11-21 15:15:25 +0000
@@ -27,7 +27,7 @@
#include <iostream>
#include <cerrno>
#include <sys/mman.h>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include "stream.h"
#include "network.h"
=== modified file 'cygnal/testsuite/cygnal.all/test_crc.cpp'
--- a/cygnal/testsuite/cygnal.all/test_crc.cpp 2008-01-21 20:55:39 +0000
+++ b/cygnal/testsuite/cygnal.all/test_crc.cpp 2008-11-21 15:15:25 +0000
@@ -27,7 +27,7 @@
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#endif
#include <regex.h>
=== modified file 'extensions/fileio/fileio.cpp'
--- a/extensions/fileio/fileio.cpp 2008-09-17 17:01:03 +0000
+++ b/extensions/fileio/fileio.cpp 2008-11-21 15:15:25 +0000
@@ -26,7 +26,7 @@
#include <boost/algorithm/string/case_conv.hpp>
#include <dirent.h> // used by scandir()
-#include <unistd.h> // used by unlink()
+#include "GnashSystemIOHeaders.h" // used by unlink()
#include <fcntl.h> // used by asyncmode()
#include "VM.h"
=== modified file 'gui/Player.cpp'
--- a/gui/Player.cpp 2008-11-18 10:38:41 +0000
+++ b/gui/Player.cpp 2008-11-21 15:15:25 +0000
@@ -49,12 +49,11 @@
# include "MediaHandlerGst.h"
#endif
-
+#include "GnashSystemIOHeaders.h" // for write()
#include "log.h"
#include <iostream>
#include <sstream>
#include <iomanip>
-#include <unistd.h> // for write() on BSD
using namespace gnash;
=== modified file 'gui/aqua.cpp'
--- a/gui/aqua.cpp 2008-05-26 21:13:32 +0000
+++ b/gui/aqua.cpp 2008-11-21 15:15:25 +0000
@@ -22,11 +22,9 @@
#endif
extern "C"{
-#include <unistd.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
-// extern int getopt(int, char *const *, const char *);
}
#include "gnash.h"
=== modified file 'gui/fb.cpp'
--- a/gui/fb.cpp 2008-10-03 09:39:44 +0000
+++ b/gui/fb.cpp 2008-11-21 15:15:25 +0000
@@ -78,7 +78,7 @@
#include <linux/fb.h>
#include <linux/kd.h>
#include <linux/vt.h>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <csignal>
#include <cstdlib> // getenv
=== modified file 'gui/sdl.cpp'
--- a/gui/sdl.cpp 2008-09-09 04:34:06 +0000
+++ b/gui/sdl.cpp 2008-11-21 15:15:25 +0000
@@ -26,7 +26,6 @@
# include "getopt_win32.h"
#else
extern "C"{
-# include <unistd.h>
# ifdef HAVE_GETOPT_H
# include <getopt.h>
# endif
=== modified file 'libamf/amftest.cpp'
--- a/libamf/amftest.cpp 2008-08-19 17:04:47 +0000
+++ b/libamf/amftest.cpp 2008-11-21 15:15:25 +0000
@@ -24,7 +24,7 @@
#include <netinet/in.h>
#include <string>
#include <sys/types.h>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
=== added file 'libbase/GnashSystemIOHeaders.h'
--- a/libbase/GnashSystemIOHeaders.h 1970-01-01 00:00:00 +0000
+++ b/libbase/GnashSystemIOHeaders.h 2008-11-21 15:15:25 +0000
@@ -0,0 +1,23 @@
+// Compatibility system headers for Gnash
+//
+// Include this file for read() and write()
+
+#ifndef GNASH_IO_HEADERS_H
+#define GNASH_IO_HEADERS_H
+
+/// Always include unistd.h unless compiling under MSVC++
+//
+/// This isn't always necessary on GNU/Linux under gcc, but it's still good
+/// practice to include it.
+//
+/// @todo A configure 'test' (a #define in gnashconfig.h) might be a better
+/// way of checking for compiler.
+
+#include "gnashconfig.h"
+#if !defined(_MSC_VER)
+# include <unistd.h>
+#else
+#include <io.h>
+#endif
+
+#endif
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2008-11-12 15:29:13 +0000
+++ b/libbase/Makefile.am 2008-11-21 15:15:25 +0000
@@ -154,6 +154,7 @@
tu_file.h \
IOChannel.h \
tu_opengl_includes.h \
+ GnashSystemIOHeaders.h \
ClockTime.h \
WallClockTimer.h \
utf8.h \
=== modified file 'libbase/URL.cpp'
--- a/libbase/URL.cpp 2008-11-20 17:50:40 +0000
+++ b/libbase/URL.cpp 2008-11-21 15:15:25 +0000
@@ -21,8 +21,6 @@
#include <iostream>
#include "URL.h"
-//#include "impl.h"
-//#include "rc.h"
#include <string>
#include <cstring>
@@ -33,22 +31,16 @@
#include <cerrno>
#include <GnashException.h>
-// these are for stat(2)
-#include <sys/types.h>
-#include <sys/stat.h>
+// This is for getcwd(2)
-#if defined(_WIN32) || defined(WIN32)
-# define PATH_MAX 255
-# define __PRETTY_FUNCTION__ __FUNCDNAME__
-# include <winsock2.h>
+#if !defined(_WIN32) && !defined(WIN32)
+# include <unistd.h>
+#else
# include <direct.h>
-#else
-# include <unistd.h>
-# include <sys/param.h>
#endif
-#include <climits>
#include <boost/tokenizer.hpp>
+#include <boost/scoped_array.hpp>
namespace gnash {
@@ -122,19 +114,32 @@
}
else
{
- //cerr << "It's relative" << endl;
- char buf[PATH_MAX+1];
- if ( ! getcwd(buf, PATH_MAX) )
- {
+ const size_t incr = 1024;
+ // When does it get silly?
+ const size_t maxSize = 4096;
+
+ boost::scoped_array<char> buf;
+ char* dir = 0;
+ size_t bufSize = 0;
+
+ // This just assumes a failure in getcwd is a name-length error,
+ // though that perhaps isn't the case.
+ while (!dir) {
+ bufSize += incr;
+ buf.reset(new char[bufSize]);
+ dir = getcwd(buf.get(), bufSize);
+ if (bufSize >= maxSize) break;
+ }
+
+ if (!dir) {
std::stringstream err;
- err << "getcwd failed: " << strerror(errno);
- throw gnash::GnashException(err.str());
- }
- char* ptr = buf+strlen(buf);
- *ptr = '/';
- ++ptr;
- *ptr = '\0';
- URL cwd(buf);
+ err << "getcwd failed: " << strerror(errno);
+ throw gnash::GnashException(err.str());
+ }
+
+ std::string currentDir(buf.get());
+ currentDir.append("/");
+ URL cwd(currentDir);
init_relative(absolute_url, cwd);
}
}
=== modified file 'libbase/noseek_fd_adapter.cpp'
--- a/libbase/noseek_fd_adapter.cpp 2008-11-14 00:46:35 +0000
+++ b/libbase/noseek_fd_adapter.cpp 2008-11-21 15:15:25 +0000
@@ -24,7 +24,7 @@
#include "utility.h"
#include "log.h"
-#include <unistd.h> // for ::read
+#include "GnashSystemIOHeaders.h" // for ::read
#include <boost/scoped_array.hpp>
@@ -38,10 +38,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#if !defined(_WIN32) && !defined(WIN32)
-# include <unistd.h>
-#endif
-
#include <string>
#include <boost/format.hpp>
=== modified file 'libcore/StreamProvider.cpp'
--- a/libcore/StreamProvider.cpp 2008-11-14 00:46:35 +0000
+++ b/libcore/StreamProvider.cpp 2008-11-21 15:15:25 +0000
@@ -40,7 +40,7 @@
# include <io.h>
# define dup _dup
#else
-#include <unistd.h>
+#include <unistd.h> // dup
#endif
namespace gnash
=== modified file 'libcore/URLAccessManager.cpp'
--- a/libcore/URLAccessManager.cpp 2008-10-28 13:00:00 +0000
+++ b/libcore/URLAccessManager.cpp 2008-11-21 15:15:25 +0000
@@ -36,7 +36,7 @@
#ifdef WIN32
# include <winsock2.h>
#else
-# include <unistd.h>
+# include "GnashSystemIOHeaders.h"
#endif
#include <cstring> // for strerror
=== modified file 'libcore/asobj/LocalConnection.cpp'
--- a/libcore/asobj/LocalConnection.cpp 2008-10-28 13:00:00 +0000
+++ b/libcore/asobj/LocalConnection.cpp 2008-11-21 15:15:25 +0000
@@ -21,7 +21,7 @@
#include "gnashconfig.h"
#endif
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <cerrno>
#include <cstring>
#include <boost/cstdint.hpp> // for boost::?int??_t
=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2008-11-18 09:29:12 +0000
+++ b/libcore/asobj/Makefile.am 2008-11-21 15:15:25 +0000
@@ -139,7 +139,6 @@
String_as.h \
XML_as.h \
XMLSocket_as.h \
- xmlattrs.h \
XMLNode_as.h \
flash/display/BitmapData_as.h \
flash/display_pkg.h \
=== modified file 'libcore/asobj/SharedObject.cpp'
--- a/libcore/asobj/SharedObject.cpp 2008-10-28 16:03:08 +0000
+++ b/libcore/asobj/SharedObject.cpp 2008-11-21 15:15:25 +0000
@@ -21,7 +21,7 @@
#include "gnashconfig.h" // USE_SOL_READ_ONLY
#endif
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <boost/tokenizer.hpp>
=== modified file 'libcore/asobj/XMLNode_as.h'
--- a/libcore/asobj/XMLNode_as.h 2008-11-21 10:50:16 +0000
+++ b/libcore/asobj/XMLNode_as.h 2008-11-21 15:15:25 +0000
@@ -23,7 +23,6 @@
#include "smart_ptr.h" // GNASH_USE_GC
#include "action.h"
#include "impl.h"
-#include "xmlattrs.h"
#include "log.h"
#include <list>
=== modified file 'libcore/asobj/XMLSocket_as.cpp'
--- a/libcore/asobj/XMLSocket_as.cpp 2008-11-14 00:46:35 +0000
+++ b/libcore/asobj/XMLSocket_as.cpp 2008-11-21 15:15:25 +0000
@@ -21,6 +21,8 @@
#include "gnashconfig.h"
#endif
+#include "GnashSystemIOHeaders.h" // read
+
#include "network.h"
#include "utility.h"
#include "XML_as.h"
@@ -35,13 +37,12 @@
#include "log.h"
-// For select() and read()
+// For select()
#ifdef HAVE_WINSOCK2_H
# include <winsock2.h>
#else
# include <sys/types.h>
# include <sys/stat.h>
-# include <unistd.h>
#endif
#include <boost/scoped_array.hpp>
=== modified file 'libcore/asobj/XML_as.cpp'
--- a/libcore/asobj/XML_as.cpp 2008-11-21 11:10:23 +0000
+++ b/libcore/asobj/XML_as.cpp 2008-11-21 15:15:25 +0000
@@ -28,7 +28,6 @@
#include "fn_call.h"
#include "LoadableObject.h"
-#include "xmlattrs.h"
#include "XMLNode_as.h"
#include "XML_as.h"
#include "builtin_function.h"
=== removed file 'libcore/asobj/xmlattrs.h'
--- a/libcore/asobj/xmlattrs.h 2008-11-18 09:29:12 +0000
+++ b/libcore/asobj/xmlattrs.h 1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifndef GNASH_XML_ATTRS_H
-#define GNASH_XML_ATTRS_H
-
-#include "log.h"
-
-namespace gnash {
-
-/// XML Attribute class
-class XMLAttr
-{
-public:
-
- XMLAttr()
- {}
-
- XMLAttr(const std::string& name, const std::string& value)
- :
- _name(name),
- _value(value)
- {}
-
- ~XMLAttr()
- {}
-
- const std::string& name() const { return _name; }
-
- const std::string& value() const { return _value; }
-
-private:
-
- std::string _name;
- std::string _value;
-
-};
-
-} // end of gnash namespace
-
-#endif
-
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp 2008-11-13 18:32:24 +0000
+++ b/libcore/movie_root.cpp 2008-11-21 15:15:25 +0000
@@ -17,6 +17,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+#include "GnashSystemIOHeaders.h" // write()
+
#include "smart_ptr.h" // GNASH_USE_GC
#include "movie_root.h"
#include "log.h"
@@ -44,7 +46,6 @@
#include <functional> // std::bind2nd, std::equal_to
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/bind.hpp>
-#include <unistd.h>
#ifdef USE_SWFTREE
# include "tree.hh"
=== modified file 'libcore/parser/SWFMovieDefinition.cpp'
--- a/libcore/parser/SWFMovieDefinition.cpp 2008-11-20 16:26:31 +0000
+++ b/libcore/parser/SWFMovieDefinition.cpp 2008-11-21 15:15:25 +0000
@@ -21,6 +21,7 @@
#include "gnashconfig.h" // USE_SWFTREE
#endif
+#include "GnashSleep.h"
#include "smart_ptr.h" // GNASH_USE_GC
#include "SWFMovieDefinition.h"
#include "movie_definition.h" // for inheritance
@@ -41,7 +42,6 @@
#include "GnashException.h" // for parser exception
#include "ControlTag.h"
#include "sound_definition.h" // for sound_sample
-#include "GnashSleep.h"
#include "ExportableResource.h"
#include <boost/bind.hpp>
@@ -50,7 +50,6 @@
#include <memory>
#include <string>
#include <algorithm> // std::make_pair
-#include <unistd.h>
// Debug frames load
#undef DEBUG_FRAMES_LOAD
=== modified file 'libcore/vm/ASHandlers.cpp'
--- a/libcore/vm/ASHandlers.cpp 2008-11-19 16:51:17 +0000
+++ b/libcore/vm/ASHandlers.cpp 2008-11-21 15:15:25 +0000
@@ -50,7 +50,6 @@
#include "utf8.h"
#include "StringPredicates.h" // StringNoCaseEqual
-#include <unistd.h> // For write() on BSD
#include <string>
#include <vector>
#include <locale>
=== modified file 'libmedia/gst/MediaParserGst.cpp'
--- a/libmedia/gst/MediaParserGst.cpp 2008-11-08 18:01:44 +0000
+++ b/libmedia/gst/MediaParserGst.cpp 2008-11-21 15:15:25 +0000
@@ -27,7 +27,6 @@
#include "swfdec_codec_gst.h"
#include <iostream>
#include <fstream>
-#include <unistd.h>
#define PUSHBUF_SIZE 1024
//#define MIN_PROBE_SIZE (PUSHBUF_SIZE * 3)
=== modified file 'libnet/http.cpp'
--- a/libnet/http.cpp 2008-09-22 18:25:27 +0000
+++ b/libnet/http.cpp 2008-11-21 15:15:25 +0000
@@ -35,7 +35,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <algorithm>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h" // read()
#include "amf.h"
#include "http.h"
=== modified file 'libnet/network.cpp'
--- a/libnet/network.cpp 2008-09-06 07:35:31 +0000
+++ b/libnet/network.cpp 2008-11-21 15:15:25 +0000
@@ -21,6 +21,7 @@
#endif
#include <boost/thread/mutex.hpp>
+# include "GnashSystemIOHeaders.h" // read()
#include "utility.h"
@@ -40,7 +41,6 @@
# include <ws2tcpip.h>
#else
# include <sys/time.h>
-# include <unistd.h>
# include <sys/select.h>
# include <netinet/in.h>
# include <arpa/inet.h>
=== modified file 'plugin/plugin.cpp'
--- a/plugin/plugin.cpp 2008-10-23 16:50:44 +0000
+++ b/plugin/plugin.cpp 2008-11-21 15:15:25 +0000
@@ -58,7 +58,7 @@
#include <sys/param.h>
#include "plugin.h" //Fixes Warning on redef of MIN/MAX
#include <csignal>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <cstdio>
#include <cstddef>
#include <cstring>
=== modified file 'testsuite/libamf.all/test_lc.cpp'
--- a/testsuite/libamf.all/test_lc.cpp 2008-10-27 07:53:58 +0000
+++ b/testsuite/libamf.all/test_lc.cpp 2008-11-21 15:15:25 +0000
@@ -40,7 +40,7 @@
#endif
extern "C"{
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
=== modified file 'testsuite/libamf.all/test_number.cpp'
--- a/testsuite/libamf.all/test_number.cpp 2008-04-13 22:46:31 +0000
+++ b/testsuite/libamf.all/test_number.cpp 2008-11-21 15:15:25 +0000
@@ -27,7 +27,7 @@
#include <sys/stat.h>
extern "C"{
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
=== modified file 'testsuite/libamf.all/test_object.cpp'
--- a/testsuite/libamf.all/test_object.cpp 2008-04-06 17:11:32 +0000
+++ b/testsuite/libamf.all/test_object.cpp 2008-11-21 15:15:25 +0000
@@ -23,7 +23,7 @@
#if 1
#include <sys/types.h>
extern "C"{
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
=== modified file 'testsuite/libamf.all/test_string.cpp'
--- a/testsuite/libamf.all/test_string.cpp 2008-01-21 23:26:48 +0000
+++ b/testsuite/libamf.all/test_string.cpp 2008-11-21 15:15:25 +0000
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <sys/types.h>
extern "C"{
- #include <unistd.h>
+ #include "GnashSystemIOHeaders.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
=== modified file 'testsuite/libamf.all/test_variable.cpp'
--- a/testsuite/libamf.all/test_variable.cpp 2008-01-21 23:26:48 +0000
+++ b/testsuite/libamf.all/test_variable.cpp 2008-11-21 15:15:25 +0000
@@ -23,7 +23,7 @@
#include <sys/types.h>
extern "C"{
- #include <unistd.h>
+ #include "GnashSystemIOHeaders.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
=== modified file 'testsuite/libbase/NoSeekFileTest.cpp'
--- a/testsuite/libbase/NoSeekFileTest.cpp 2008-08-22 15:11:39 +0000
+++ b/testsuite/libbase/NoSeekFileTest.cpp 2008-11-21 15:15:25 +0000
@@ -32,7 +32,7 @@
#include <iostream>
#include <cassert>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
=== modified file 'testsuite/libbase/TCXXRc.cpp'
--- a/testsuite/libbase/TCXXRc.cpp 2008-08-19 17:04:47 +0000
+++ b/testsuite/libbase/TCXXRc.cpp 2008-11-21 15:15:25 +0000
@@ -29,7 +29,7 @@
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#endif
#include <regex.h>
=== modified file 'testsuite/libcore.all/BitsReaderTest.cpp'
--- a/testsuite/libcore.all/BitsReaderTest.cpp 2008-01-21 23:26:48 +0000
+++ b/testsuite/libcore.all/BitsReaderTest.cpp 2008-11-21 15:15:25 +0000
@@ -33,7 +33,7 @@
#include <iostream>
#include <cassert>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
=== modified file 'testsuite/libcore.all/StreamTest.cpp'
--- a/testsuite/libcore.all/StreamTest.cpp 2008-09-06 05:38:21 +0000
+++ b/testsuite/libcore.all/StreamTest.cpp 2008-11-21 15:15:25 +0000
@@ -37,7 +37,7 @@
#include <iostream>
#include <cassert>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
=== modified file 'testsuite/libnet.all/test_cque.cpp'
--- a/testsuite/libnet.all/test_cque.cpp 2008-09-22 18:25:27 +0000
+++ b/testsuite/libnet.all/test_cque.cpp 2008-11-21 15:15:25 +0000
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#endif
#include <regex.h>
=== modified file 'testsuite/libnet.all/test_crc.cpp'
--- a/testsuite/libnet.all/test_crc.cpp 2008-03-28 21:30:15 +0000
+++ b/testsuite/libnet.all/test_crc.cpp 2008-11-21 15:15:25 +0000
@@ -27,7 +27,7 @@
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#endif
#include <regex.h>
=== modified file 'testsuite/libnet.all/test_handler.cpp'
--- a/testsuite/libnet.all/test_handler.cpp 2008-10-25 16:29:39 +0000
+++ b/testsuite/libnet.all/test_handler.cpp 2008-11-21 15:15:25 +0000
@@ -26,7 +26,7 @@
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#endif
#include <regex.h>
=== modified file 'testsuite/libnet.all/test_http.cpp'
--- a/testsuite/libnet.all/test_http.cpp 2008-04-02 01:06:57 +0000
+++ b/testsuite/libnet.all/test_http.cpp 2008-11-21 15:15:25 +0000
@@ -23,7 +23,7 @@
#include <string>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif
=== modified file 'testsuite/misc-ming.all/DragDropTestRunner.cpp'
--- a/testsuite/misc-ming.all/DragDropTestRunner.cpp 2008-10-25 10:38:32
+0000
+++ b/testsuite/misc-ming.all/DragDropTestRunner.cpp 2008-11-21 15:15:25
+0000
@@ -33,7 +33,7 @@
#include <string>
#include <cassert>
#include <sstream>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
using namespace gnash;
=== modified file 'testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp'
--- a/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp 2008-11-19
18:27:30 +0000
+++ b/testsuite/misc-ming.all/NetStream-SquareTestRunner.cpp 2008-11-21
15:15:25 +0000
@@ -32,7 +32,7 @@
#include "check.h"
#include <string>
#include <cassert>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
using namespace gnash;
using namespace std;
=== modified file 'testsuite/misc-ming.all/intervalTestRunner.cpp'
--- a/testsuite/misc-ming.all/intervalTestRunner.cpp 2008-10-25 10:38:32
+0000
+++ b/testsuite/misc-ming.all/intervalTestRunner.cpp 2008-11-21 15:15:25
+0000
@@ -30,7 +30,7 @@
#include "check.h"
#include <string>
#include <cassert>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
using namespace gnash;
using namespace std;
=== modified file 'testsuite/misc-ming.all/loadMovieTestRunner.cpp'
--- a/testsuite/misc-ming.all/loadMovieTestRunner.cpp 2008-10-25 10:38:32
+0000
+++ b/testsuite/misc-ming.all/loadMovieTestRunner.cpp 2008-11-21 15:15:25
+0000
@@ -32,7 +32,7 @@
#include "check.h"
#include <string>
#include <cassert>
-#include <unistd.h>
+#include "GnashSystemIOHeaders.h"
using namespace gnash;
using namespace std;
=== modified file 'utilities/dumpshm.cpp'
--- a/utilities/dumpshm.cpp 2008-10-26 23:37:24 +0000
+++ b/utilities/dumpshm.cpp 2008-11-21 15:15:25 +0000
@@ -19,14 +19,14 @@
#include "gnashconfig.h"
#endif
-#include <stdarg.h>
+#include "GnashSystemIOHeaders.h" // write()
+#include <cstdarg>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#include <cerrno>
extern "C"{
-#include <unistd.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
=== modified file 'utilities/soldumper.cpp'
--- a/utilities/soldumper.cpp 2008-08-05 16:06:37 +0000
+++ b/utilities/soldumper.cpp 2008-11-21 15:15:25 +0000
@@ -30,7 +30,6 @@
#endif
extern "C"{
-#include <unistd.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10320: Make a start at rationalizing system header includes. Remove unused file.,
Benjamin Wolsey <=