diff --git a/bin/dosmkfil b/bin/dosmkfil index b775176..4bedf4e 100644 --- a/bin/dosmkfil +++ b/bin/dosmkfil @@ -9,7 +9,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj KEY = keytstno.obj CFLAGS = -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ - -DNOFORN -DNOETHER -DNOVERSION -DLPSOLVE -g + -DNOFORN -DNOVERSION -DLPSOLVE -g LDFLAGS = -g graphics.lib binmode.lib mouse.lib diff --git a/bin/makefile-dos b/bin/makefile-dos index b775176..4bedf4e 100644 --- a/bin/makefile-dos +++ b/bin/makefile-dos @@ -9,7 +9,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj KEY = keytstno.obj CFLAGS = -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ - -DNOFORN -DNOETHER -DNOVERSION -DLPSOLVE -g + -DNOFORN -DNOVERSION -DLPSOLVE -g LDFLAGS = -g graphics.lib binmode.lib mouse.lib diff --git a/bin/makefile.dos b/bin/makefile.dos index fe11a25..fe7b76d 100644 --- a/bin/makefile.dos +++ b/bin/makefile.dos @@ -9,7 +9,7 @@ LPFILES = lpmain.obj lpread.obj lpsolve.obj lpwrite.obj lpdual.obj lptran.obj KEY = keytstno.obj CFLAGS = -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT \ - -DNOFORN -DNOETHER -DNOVERSION + -DNOFORN -DNOVERSION LDFLAGS = -g graphics.lib binmode.lib mouse.lib diff --git a/bin/mkdos b/bin/mkdos index 99d215c..b8890f6 100644 --- a/bin/mkdos +++ b/bin/mkdos @@ -25,7 +25,7 @@ # remember -DNOEUROKBD #ifdef _INTELC32_ /* The cpp macro for the DOS extender */ -#define EXTRACFLAGS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN -DNOETHER +#define EXTRACFLAGS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN #define EXTRALDFLAGS graphics.lib binmode.lib mouse.lib AFLAGS = /T COLORFILES = rawcolor.obj diff --git a/bin/mkfile b/bin/mkfile index 21a1238..51a469e 100644 --- a/bin/mkfile +++ b/bin/mkfile @@ -29,7 +29,7 @@ #define OBJECTDIR . #define BINDIR ../bin #define INCDIR ../inc -#define EXTRACFLAGS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN -DNOETHER +#define EXTRACFLAGS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN #define EXTRALDFLAGS graphics.lib binmode.lib mouse.lib BINARYDIR = BINDIR AFLAGS = /T diff --git a/bin/mkfile.c b/bin/mkfile.c index 21a1238..51a469e 100644 --- a/bin/mkfile.c +++ b/bin/mkfile.c @@ -29,7 +29,7 @@ #define OBJECTDIR . #define BINDIR ../bin #define INCDIR ../inc -#define EXTRACFLAGS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN -DNOETHER +#define EXTRACFLAGS -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN #define EXTRALDFLAGS graphics.lib binmode.lib mouse.lib BINARYDIR = BINDIR AFLAGS = /T diff --git a/bin/mkfile.i b/bin/mkfile.i index 79a9657..b95e03f 100644 --- a/bin/mkfile.i +++ b/bin/mkfile.i @@ -24,7 +24,7 @@ ETHERFILES = ldeether.obj KEY = keytstno.obj -CFLAGS = -I. -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN -DNOETHER -O2 +CFLAGS = -I. -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -DNOFORN -O2 LDFLAGS = -O2 graphics.lib binmode.lib mouse.lib diff --git a/inc/version.h b/inc/version.h index e757771..e101ff7 100755 --- a/inc/version.h +++ b/inc/version.h @@ -204,6 +204,7 @@ error Must specify RELEASE to build Medley. /* Set up defaults */ +#define NOETHER 1 #define UNALIGNED_FETCH_OK #define REGISTER register #define HAS_GETHOSTID @@ -238,6 +239,7 @@ typedef signed char s_char; /********************************************************/ #ifdef OS5 /* Solaris, sort of SYSV-ish, but not really */ +#undef NOETHER #define SYSVSIGNALS 1 #define NOFORN #define LOCK_X_UPDATES 1 @@ -251,8 +253,6 @@ typedef signed char s_char; /********************************************************/ #ifdef LINUX /* LINUX, the free POSIX-compliant Unix */ -#define NOETHER 1 - #undef REGISTER #define REGISTER @@ -269,8 +269,6 @@ typedef signed char s_char; /********************************************************/ #if defined(MACOSX) || defined(FREEBSD) /* MacOS X, FreeBSD - mostly POSIX-compliant Unix */ -#define NOETHER 1 - #undef REGISTER #define REGISTER @@ -300,7 +298,6 @@ typedef unsigned short u_short; #define REGISTER #define SYSVONLY 1 #define SYSVSIGNALS 1 -#define NOETHER 1 #define USHORT unsigned #else #define USHORT unsigned short