summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-02-06 15:40:36 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-02-06 15:40:36 +0000
commita128b7aceccb39c2aeefe79b8bbb234c6bc9d4f8 (patch)
tree0c6665fa45dac3993bf794a68414afd98ab28476
parent98ff1b85ef7e1dffcb33c41213bd201bb433a1e7 (diff)
downloadnetsurf-a128b7aceccb39c2aeefe79b8bbb234c6bc9d4f8.tar.gz
netsurf-a128b7aceccb39c2aeefe79b8bbb234c6bc9d4f8.tar.bz2
Rationalise definition of NO_IPV6 for atari frontend
svn path=/trunk/netsurf/; revision=11623
-rw-r--r--Makefile.defaults2
-rw-r--r--atari/Makefile.target2
-rw-r--r--utils/config.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.defaults b/Makefile.defaults
index 21dc7e35c..44ad6fbf8 100644
--- a/Makefile.defaults
+++ b/Makefile.defaults
@@ -336,7 +336,7 @@ ifeq ($(TARGET),atari)
NETSURF_ATARI_USE_FREETYPE := YES
# Optimisation levels
- CFLAGS += -m68000 -O2 -Wuninitialized -DNO_IPV6
+ CFLAGS += -m68000 -O2 -Wuninitialized
WARNFLAGS = -W -Wundef -Wpointer-arith \
-Wcast-align -Wwrite-strings -Wstrict-prototypes \
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 00f902763..7b9f7b2e9 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -5,7 +5,7 @@
$(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG/MNG/JNG (libmng)))
$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
-CFLAGS += -I/usr/GEM/include -DNO_IPV6
+CFLAGS += -I/usr/GEM/include
LDFLAGS += -L/usr/GEM/lib -lcflib
CFLAGS += -DATARI_USE_FREETYPE $(shell freetype-config --cflags)
diff --git a/utils/config.h b/utils/config.h
index 416d642b1..950429b57 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -104,7 +104,8 @@ char *realpath(const char *path, char *resolved_path);
#define WITH_THEME_INSTALL
#endif
-#if defined(__amigaos4__) || defined(__AMIGA__)
+#if defined(__amigaos4__) || defined(__AMIGA__) || \
+ defined(nsatari)
#define NO_IPV6
#endif