From 9f0c9b4a0b27f9794470e7def93e44e007b9fde3 Mon Sep 17 00:00:00 2001 From: Sean Hunt Date: Mon, 3 Aug 2015 12:56:26 -0400 Subject: [PATCH] Revert "Properly define NH360_DEDICATION in Makefiles" This reverts commit 3db39ca221f34d6f606f7b2854f7f9be7744fce1. --- sys/unix/hints/linux | 2 +- sys/unix/hints/linux-x11 | 2 +- sys/unix/hints/macosx | 2 +- sys/unix/hints/macosx10.10 | 2 +- sys/unix/hints/macosx10.5 | 2 +- sys/unix/hints/macosx10.7 | 2 +- sys/unix/hints/unix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/unix/hints/linux b/sys/unix/hints/linux index fbd407f97..c270bd9cc 100644 --- a/sys/unix/hints/linux +++ b/sys/unix/hints/linux @@ -22,7 +22,7 @@ CFLAGS=-g -O -I../include -DNOTPARMDECL $(CFLAGS1) -DDLB CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE CFLAGS+=-DHACKDIR=\"$(HACKDIR)\" -CFLAGS+=-DNH360_DEDICATION +CFLAGS+=NH360_DEDICATION LINK=$(CC) # Only needed for GLIBC stack trace: diff --git a/sys/unix/hints/linux-x11 b/sys/unix/hints/linux-x11 index 4d4911bbd..bd25f1955 100644 --- a/sys/unix/hints/linux-x11 +++ b/sys/unix/hints/linux-x11 @@ -22,7 +22,7 @@ CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1) $(CFLAGS3) CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS3=-DX11_GRAPHICS -DDEFAULT_WINDOW_SYS=\"X11\" -DNOTTYGRAPHICS -CFLAGS+=-DNH360_DEDICATION +CFLAGS+=NH360_DEDICATION LINK=$(CC) diff --git a/sys/unix/hints/macosx b/sys/unix/hints/macosx index 2fc773334..b3495d1df 100644 --- a/sys/unix/hints/macosx +++ b/sys/unix/hints/macosx @@ -56,7 +56,7 @@ CC=gcc -Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -W CFLAGS=-g -I../include CFLAGS+=-DNOCLIPPING -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB -CFLAGS+= -DNH360_DEDICATION +CFLAGS+=NH360_DEDICATION ifdef WANT_WIN_TTY WINSRC = $(WINTTYSRC) diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10 index 5292f146d..cabdf28bd 100644 --- a/sys/unix/hints/macosx10.10 +++ b/sys/unix/hints/macosx10.10 @@ -77,7 +77,7 @@ CFLAGS+= -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB CFLAGS+= -DGREPPATH=\"/usr/bin/grep\" -CFLAGS+= -DNH360_DEDICATION +CFLAGS+=NH360_DEDICATION ifdef WANT_WIN_CHAIN CFLAGS+= -DWINCHAIN diff --git a/sys/unix/hints/macosx10.5 b/sys/unix/hints/macosx10.5 index bf487f50c..fcf9f7b11 100644 --- a/sys/unix/hints/macosx10.5 +++ b/sys/unix/hints/macosx10.5 @@ -65,7 +65,7 @@ CFLAGS+=-DNOCLIPPING -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB CFLAGS+= -DGREPPATH=\"/usr/bin/grep\" -CFLAGS+= -DNH360_DEDICATION +CFLAGS+=NH360_DEDICATION ifdef WANT_WIN_TTY WINSRC = $(WINTTYSRC) diff --git a/sys/unix/hints/macosx10.7 b/sys/unix/hints/macosx10.7 index 23982551a..71a5866ec 100644 --- a/sys/unix/hints/macosx10.7 +++ b/sys/unix/hints/macosx10.7 @@ -75,7 +75,7 @@ CFLAGS+=-g -I../include CFLAGS+= -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\" CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB -CFLAGS+= -DNH360_DEDICATION +CFLAGS+=NH360_DEDICATION CFLAGS+= -DGREPPATH=\"/usr/bin/grep\" ifdef WANT_WIN_CHAIN diff --git a/sys/unix/hints/unix b/sys/unix/hints/unix index 83c8118df..b6c8b5a73 100644 --- a/sys/unix/hints/unix +++ b/sys/unix/hints/unix @@ -16,7 +16,7 @@ SHELLDIR=$(PREFIX)/games CFLAGS=-O -I../include LINK=$(CC) -CFLAGS+=-DNH360_DEDICATION +CFLAGS+=NH360_DEDICATION WINSRC = $(WINTTYSRC) WINOBJ = $(WINTTYOBJ)