From a128b7aceccb39c2aeefe79b8bbb234c6bc9d4f8 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sun, 6 Feb 2011 15:40:36 +0000 Subject: Rationalise definition of NO_IPV6 for atari frontend svn path=/trunk/netsurf/; revision=11623 --- Makefile.defaults | 2 +- atari/Makefile.target | 2 +- utils/config.h | 3 ++- 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 -- cgit v1.2.3