diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/lib/Makefile.in | 8 | ||||
| -rw-r--r-- | 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 e315a1585b4..690f7c21249 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 768c5d86b92..43068aacce2 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 |