Author: loonycyborg
Date: Wed Jun 11 22:25:36 2008
New Revision: 27105
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27105&view=rev
Log:
Removed scons check for sendfile.
Modified:
trunk/SConstruct
trunk/src/network_worker.hpp
Modified: trunk/SConstruct
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=27105&r1=27104&r2=27105&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Wed Jun 11 22:25:36 2008
@@ -178,13 +178,10 @@
if env['fribidi']:
env['fribidi'] = conf.CheckLibWithHeader('fribidi',
'fribidi/fribidi.h', 'C', 'fribidi_utf8_to_unicode(NULL,0,NULL);') or
Warning("Can't find libfribidi, disabling freebidi support.")
- env['sendfile'] = False
if env["PLATFORM"] == "posix":
conf.CheckCHeader("poll.h", "<>")
conf.CheckCHeader("sys/poll.h", "<>")
conf.CheckCHeader("sys/select.h", "<>")
- if sys.platform == "linux2":
- env['sendfile'] = conf.CheckCHeader('sys/sendfile.h', '<>') or
Warning("Can't find sendfile, disabling sendfile support.")
have_server_prereqs = conf.CheckSDL('SDL_net') or Warning("Server
prerequisites are not met. wesnothd and campaignd cannot be built.")
@@ -247,9 +244,6 @@
if env['python']:
env.Append(CPPDEFINES = "HAVE_PYTHON")
-
-if env['sendfile']:
- env.Append(CPPDEFINES = "USE_SENDFILE")
if have_X:
env.Append(CPPDEFINES = "_X11")
Modified: trunk/src/network_worker.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/network_worker.hpp?rev=27105&r1=27104&r2=27105&view=diff
==============================================================================
--- trunk/src/network_worker.hpp (original)
+++ trunk/src/network_worker.hpp Wed Jun 11 22:25:36 2008
@@ -17,10 +17,8 @@
// Check if sendfile function is implemented by glibc
// It is linux only extension
-#ifdef __GNUC_PREREQ
-#if __GNUC_PREREQ(2,1)
+#if defined(__linux__) && defined(__GNUC_PREREQ) && __GNUC_PREREQ(2,1)
#define USE_SENDFILE
-#endif
#endif
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
