From 19740e2fff22e07244183ac0e888794e63016c89 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 30 Nov 1998 00:30:05 +0000
Subject: [PATCH] Portability fixes found needed for SunOS 4.1.x: SunOS has
 tas(), but not memmove or strerror, and its sprintf() doesn't return int. 
 Also, older versions of GNU Make don't like rules with empty left-hand
 sides...

---
 src/Makefile.shlib        | 4 +++-
 src/bin/psql/Makefile.in  | 4 ++--
 src/include/port/sunos4.h | 5 +++++
 src/include/regex/utils.h | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 66b51fc118..eb4da6fcf6 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
 # Copyright (c) 1998, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.4 1998/11/12 05:27:00 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.5 1998/11/30 00:30:03 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -171,8 +171,10 @@ else
 endif
 	$(RANLIB) $@
 
+ifneq ($(shlib),)
 $(shlib): $(OBJS)
 	$(LD) $(LDFLAGS_SL) -o $@ $(OBJS) $(SHLIB_LINK)
+endif
 
 # Rules to install regular and shared libraries
 
diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index 66a9748669..1af2e51ff8 100644
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.13 1998/07/26 04:31:20 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.14 1998/11/30 00:30:05 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -28,7 +28,7 @@ ifdef MULTIBYTE
 CFLAGS+= $(MBFLAGS)
 endif
 
-OBJS= psql.o stringutils.o @STRDUP@ 
+OBJS= psql.o stringutils.o @STRDUP@ @STRERROR2@
 
 all: submake psql
 
diff --git a/src/include/port/sunos4.h b/src/include/port/sunos4.h
index f08580cfaf..e9c0ec29d4 100644
--- a/src/include/port/sunos4.h
+++ b/src/include/port/sunos4.h
@@ -1,4 +1,9 @@
 #define USE_POSIX_TIME
+#define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
+
+/* sprintf() returns char *, not int, on SunOS 4.1.x */
+#define SPRINTF_CHAR
 
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h
index e6f169065f..de36c6ffb5 100644
--- a/src/include/regex/utils.h
+++ b/src/include/regex/utils.h
@@ -58,6 +58,6 @@ typedef unsigned char uch;
 #endif
 
 /* for old systems with bcopy() but no memmove() */
-#if !defined(HAVE_MEMMOVE)
+#if !defined(HAVE_MEMMOVE) && !defined(memmove)
 #define memmove(d, s, c)		bcopy(s, d, c)
 #endif
-- 
2.40.0