database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

The attached patches fix the following problems:

Browse Source 
1.  The UnixWare tas macro was reformatted (by indent or it like?) which caused
    it to break.  The asm macro construct is very particular about the %mem
    construct -- it has to start in column 1.

2.  When compiling libpq++, g++ was used even if configure found the C++ com-
    piler to be CC.

3.  When compiling libpq++, '-Wno-error' was added to CXXFLAGS, even if the
    compiler wasn't g++.

Billy G. Allie
This commit is contained in:
Bruce Momjian 1998-09-11 16:56:24 +00:00
parent 339d2769a1
commit f1ab71ec5f
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configure.in
View File

@ -811,4 +811,4 @@ then
LDFLAGS="$ice_save_LDFLAGS" LDFLAGS="$ice_save_LDFLAGS"
fi fi
AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile include/version.h) AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpq++/Makefile interfaces/libpgtcl/Makefile interfaces/ecpg/lib/Makefile include/version.h)

11
src/include/storage/s_lock.h
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.45 1998/09/01 04:38:32 momjian Exp $ * $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.46 1998/09/11 16:56:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -198,13 +198,14 @@ tas(volatile slock_t *lock)
asm int asm int
tas(slock_t *s_lock) tas(slock_t *s_lock)
{ {
%mem s_lock /* UNIVEL wants %mem in column 1, so we don't pg_indent this file */
pushl % ebx %mem s_lock
pushl %ebx
movl s_lock, %ebx movl s_lock, %ebx
movl $255, %eax movl $255, %eax
lock lock
xchgb % al, (%ebx) xchgb %al, (%ebx)
popl % ebx popl %ebx
} }
#endif /* USE_UNIVEL_CC */ #endif /* USE_UNIVEL_CC */

8
src/interfaces/libpq++/Makefile → src/interfaces/libpq++/Makefile.in
View File

@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.20 1998/08/22 04:24:35 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.1 1998/09/11 16:56:23 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -18,11 +18,17 @@ LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
LIBNAME= libpq++ LIBNAME= libpq++
CXX=@CXX@
# We have to override -Werror, which makes warnings, fatal, because we # We have to override -Werror, which makes warnings, fatal, because we
# inevitably get the warning, "abstract declarator used as declaration" # inevitably get the warning, "abstract declarator used as declaration"
# because of our inclusion of c.h and we don't know how to stop that. # because of our inclusion of c.h and we don't know how to stop that.
ifeq ($(CXX), g++)
CXXFLAGS= $(CFLAGS) -Wno-error CXXFLAGS= $(CFLAGS) -Wno-error
else
CXXFLAGS= $(CFLAGS)
endif
INCLUDE_OPT= \ INCLUDE_OPT= \
-I$(SRCDIR)/backend \ -I$(SRCDIR)/backend \

2
src/tools/pgindent/README
View File

@ -3,7 +3,7 @@ This can format all PostgreSQL *.c and *.h files, excluding libpq++,
On 09/06/1997, from the top directory, I ran: On 09/06/1997, from the top directory, I ran:
find . -name '*.[ch]' -type f -print | grep -v '++' | grep -v '/odbc/' | xargs -n100 pgindent find . -name '*.[ch]' -type f -print | egrep -v '++|/odbc/|s_lock.h' | xargs -n100 pgindent
The stock BSD indent has two bugs. First, a comment after the word 'else' The stock BSD indent has two bugs. First, a comment after the word 'else'
causes the rest of the file to be ignored. Second, it silently ignores causes the rest of the file to be ignored. Second, it silently ignores