From 31bca4540e7310855a51ddb9a0c54b1a03e6f7f5 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 14 Oct 1998 17:59:22 +0000
Subject: [PATCH] I have included a couple of patches that will make postgres
 compile out of the tar file on Solaris with the SUN 5.0 compilers. These
 compilers will be needed if you wan to compile the libpg++ interface without
 using the gcc/g++. The SC4.2 compilers do not understand the string class.

The first patch changes the ecpg intermediate shared library
name from *.sho to *.sho.o so that the SUN compiler will
allow it to be used in conjunction with the -o option.

Matthew C. Aycock
---
 src/interfaces/ecpg/lib/Makefile.in | 8 ++++----
 src/interfaces/libpq++/pgenv.h      | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index e315a1585b..690f7c2124 100644
--- a/src/interfaces/ecpg/lib/Makefile.in
+++ b/src/interfaces/ecpg/lib/Makefile.in
@@ -74,8 +74,8 @@ endif
 
 all: lib$(NAME).a $(shlib)
 
-$(shlib): ecpglib.sho typename.sho
-	$(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho
+$(shlib): ecpglib.sho.o typename.sho.o
+	$(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho.o
 
 clean:
 	rm -f *.o *.sho *.a core a.out *~ $(shlib) lib$(NAME)$(DLSUFFIX)
@@ -104,7 +104,7 @@ ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
 typename.o : typename.c ../include/ecpgtype.h
 	$(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c $< -o $@
 
-ecpglib.sho : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
+ecpglib.sho.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
 	$(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@
-typename.sho : typename.c ../include/ecpgtype.h
+typename.sho.o : typename.c ../include/ecpgtype.h
 	$(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@
diff --git a/src/interfaces/libpq++/pgenv.h b/src/interfaces/libpq++/pgenv.h
index 768c5d86b9..43068aacce 100644
--- a/src/interfaces/libpq++/pgenv.h
+++ b/src/interfaces/libpq++/pgenv.h
@@ -20,6 +20,11 @@
 
 #include <string>
 
+#ifdef __sun__
+#ifndef __GNUC__
+using namespace std;
+#endif
+#endif
 
 //
 // these are the environment variables used for getting defaults
-- 
2.11.0