From f8066a66f9427cdcce294fd2c9970a4e669c5a8b Mon Sep 17 00:00:00 2001
From: briano <briano@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 1 May 1998 02:04:06 +0000
Subject: [PATCH] Eliminated the confusing and pointless OS version macros.

git-svn-id: svn://10.0.0.236/trunk@965 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/Linux.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mozilla/config/Linux.mk b/mozilla/config/Linux.mk
index e0e95baeb36..677bd3bb9e8 100644
--- a/mozilla/config/Linux.mk
+++ b/mozilla/config/Linux.mk
@@ -38,7 +38,7 @@ MOTIF			=
 MOTIFLIB		=
 OS_LIBS			=
 
-PLATFORM_FLAGS		= -ansi -Wall -pipe -DLINUX -Dlinux -DLINUX1_2
+PLATFORM_FLAGS		= -ansi -Wall -pipe -DLINUX -Dlinux
 MOVEMAIL_FLAGS		= -DHAVE_STRERROR
 PORT_FLAGS		= -D_POSIX_SOURCE -D_BSD_SOURCE -DSW_THREADS -DNEED_ENDIAN_H -DNEED_GETOPT_H -DNEED_IOCTL_H -DUSE_NODL_TABS -DHAVE_SIGNED_CHAR -DNEED_SYS_TIME_H -DHAVE_SYS_BITYPES_H -DNEED_UINT_T
 PDJAVA_FLAGS		= -mx128m
@@ -91,19 +91,14 @@ endif
 ifeq ($(OS_RELEASE),1.2)
 PORT_FLAGS		+= -DNEED_SYS_WAIT_H
 endif
-ifneq (,$(filter 2.0 2.1,$(OS_RELEASE)))
+ifeq ($(basename $(OS_RELEASE)),2)
 PORT_FLAGS		+= -DNO_INT64_T
-PLATFORM_FLAGS		+= -DLINUX2_0
 BUILD_UNIX_PLUGINS	= 1
 MKSHLIB			= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
 ifdef BUILD_OPT
 OPTIMIZER		= -O2
 endif
 endif
-# I think just -DLINUX1 for 1.x, -DLINUX2 for 2.x, ... would be a better strategy (?) --briano.
-ifeq ($(OS_RELEASE),2.1)
-PLATFORM_FLAGS		+= -DLINUX2_1
-endif
 
 ######################################################################
 # Overrides for defaults in config.mk (or wherever)