[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bzflag-commits
Subject:    SF.net SVN: bzflag:[22729] trunk/bzflag
From:       bullet_catcher () users ! sourceforge ! net
Date:       2013-04-06 6:33:40
Message-ID: E1UOMh5-0005IL-0v () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 22729
          http://sourceforge.net/p/bzflag/code/22729
Author:   bullet_catcher
Date:     2013-04-06 06:33:38 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Include limits.h when it is available, for GCC 4 on Solaris.

Modified Paths:
--------------
    trunk/bzflag/configure.ac
    trunk/bzflag/include/common.h

Modified: trunk/bzflag/configure.ac
===================================================================
--- trunk/bzflag/configure.ac	2013-04-06 06:30:41 UTC (rev 22728)
+++ trunk/bzflag/configure.ac	2013-04-06 06:33:38 UTC (rev 22729)
@@ -350,6 +350,7 @@
 	dsound.h \
 	fcntl.h \
 	inttypes.h \
+	limits.h \
 	linux/input.h \
 	process.h \
 	sched.h \
@@ -675,7 +676,7 @@
 	# time to use -Wextra instead of -W ? (gcc 3.4+)
 	FLAGS="-Wall -W -Wundef -Wshadow"
 	CONF_CFLAGS="$CONF_CFLAGS $FLAGS"
-	CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS -std=c++0x -pedantic"
+	CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS -pedantic"
 	case $host_vendor in
 	     pc)
 	       if expr `$CC -dumpversion` \>= "3.4" > /dev/null ; then
@@ -746,7 +747,7 @@
 
 if test x$enable_debug = xyes ; then
     CONF_CFLAGS="$CONF_CFLAGS -Werror -g -O0"
-    CONF_CXXFLAGS="$CONF_CXXFLAGS -Werror -g -O0"
+    CONF_CXXFLAGS="-std=c++0x $CONF_CXXFLAGS -Werror -g -O0"
     # revert automatic setting of CFLAGS and CXXFLAGS to prevent
     # override of "-g -O0" put into CONF_CFLAGS and CONF_CXXFLAGS above
     CFLAGS="$user_CFLAGS"
@@ -756,7 +757,7 @@
     if test "$GCC" = yes ; then
 	OPTIMIZE="-fexpensive-optimizations"
 	CONF_CFLAGS="$CONF_CFLAGS $OPTIMIZE"
-	CONF_CXXFLAGS="$CONF_CXXFLAGS $OPTIMIZE"
+	CONF_CXXFLAGS="-std=c++0x $CONF_CXXFLAGS $OPTIMIZE"
     fi
     AC_DEFINE(NDEBUG, 1, [Debugging disabled])
 fi

Modified: trunk/bzflag/include/common.h
===================================================================
--- trunk/bzflag/include/common.h	2013-04-06 06:30:41 UTC (rev 22728)
+++ trunk/bzflag/include/common.h	2013-04-06 06:33:38 UTC (rev 22729)
@@ -195,6 +195,9 @@
 #  ifdef HAVE_VALUES_H
 #    include <values.h>
 #  endif
+#  ifdef HAVE_LIMITS_H
+#    include <limits.h>
+#  endif
 #else
 #  include <limits.h>
 /* BeOS: FIXME */

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire 
the most talented Cisco Certified professionals. Visit the 
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
BZFlag-commits mailing list
BZFlag-commits@lists.SourceForge.net
https://lists.SourceForge.net/lists/listinfo/bzflag-commits
irc: #BZFlag @ irc.freenode.net


[prev in list] [next in list] [prev in thread] [next in thread]