From c9f84af591d15fbc3fa890bcd955d94f1ff82a0b Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue, 17 Mar 2009 14:59:16 -0700
Subject: [PATCH] Remove ifdef checks for macII left over from ancient A/UX 3.0
 support

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 modules/lc/def/lcDefConv.c | 2 +-
 modules/lc/gen/lcGenConv.c | 2 +-
 modules/lc/xlocale/lcJis.c | 2 +-
 src/util/makekeys.c        | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/lc/def/lcDefConv.c b/modules/lc/def/lcDefConv.c
index fb504d11..18961ee1 100644
--- a/modules/lc/def/lcDefConv.c
+++ b/modules/lc/def/lcDefConv.c
@@ -46,7 +46,7 @@
 #define MB_LEN_MAX 6
 #endif
 
-#if !defined(macII) && !defined(Lynx_22) && !defined(X_LOCALE)
+#if !defined(Lynx_22) && !defined(X_LOCALE)
 #define STDCVT
 #endif
 
diff --git a/modules/lc/gen/lcGenConv.c b/modules/lc/gen/lcGenConv.c
index 8276bb3b..e53a67f2 100644
--- a/modules/lc/gen/lcGenConv.c
+++ b/modules/lc/gen/lcGenConv.c
@@ -55,7 +55,7 @@
 #include "XlcGeneric.h"
 #include <stdio.h>
 
-#if !defined(macII) && !defined(Lynx_22) && !defined(X_LOCALE)
+#if !defined(Lynx_22) && !defined(X_LOCALE)
 #define STDCVT
 #endif
 
diff --git a/modules/lc/xlocale/lcJis.c b/modules/lc/xlocale/lcJis.c
index 12b344ea..06c6b1fd 100644
--- a/modules/lc/xlocale/lcJis.c
+++ b/modules/lc/xlocale/lcJis.c
@@ -41,7 +41,7 @@
 #include "XlcGeneric.h"
 #include <stdio.h>
 
-#if !defined(macII) && !defined(X_LOCALE)
+#if !defined(X_LOCALE)
 #define STDCVT
 #endif
 
diff --git a/src/util/makekeys.c b/src/util/makekeys.c
index eacd1803..72736a1f 100644
--- a/src/util/makekeys.c
+++ b/src/util/makekeys.c
@@ -36,9 +36,6 @@ from The Open Group.
 #include <X11/keysymdef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
-char *malloc();
-#endif /* macII */
 
 typedef unsigned long Signature;