Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf1ab71e

Browse files
committed
The attached patches fix the following problems:
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
1 parent339d276 commitf1ab71e

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

‎src/configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,4 +811,4 @@ then
811811
LDFLAGS="$ice_save_LDFLAGS"
812812
fi
813813

814-
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)
814+
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)

‎src/include/storage/s_lock.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.45 1998/09/01 04:38:32 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.46 1998/09/11 16:56:20 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -198,13 +198,14 @@ tas(volatile slock_t *lock)
198198
asmint
199199
tas(slock_t*s_lock)
200200
{
201-
%mems_lock
202-
pushl %ebx
201+
/* UNIVEL wants %mem in column 1, so we don't pg_indent this file */
202+
%mems_lock
203+
pushl %ebx
203204
movls_lock, %ebx
204205
movl$255, %eax
205206
lock
206-
xchgb %al, (%ebx)
207-
popl %ebx
207+
xchgb %al, (%ebx)
208+
popl %ebx
208209
}
209210

210211
#endif/* USE_UNIVEL_CC */

‎src/interfaces/libpq++/Makefilerenamed to‎src/interfaces/libpq++/Makefile.in

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.20 1998/08/22 04:24:35 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.1 1998/09/11 16:56:23 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -18,11 +18,17 @@ LIBPQHEADERDIR = $(SRCHEADERDIR)/libpq
1818

1919
LIBNAME= libpq++
2020

21+
CXX=@CXX@
22+
2123
# We have to override -Werror, which makes warnings, fatal, because we
2224
# inevitably get the warning, "abstract declarator used as declaration"
2325
# because of our inclusion of c.h and we don't know how to stop that.
2426

27+
ifeq ($(CXX), g++)
2528
CXXFLAGS=$(CFLAGS) -Wno-error
29+
else
30+
CXXFLAGS=$(CFLAGS)
31+
endif
2632

2733
INCLUDE_OPT=\
2834
-I$(SRCDIR)/backend\

‎src/tools/pgindent/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ This can format all PostgreSQL *.c and *.h files, excluding libpq++,
33

44
On 09/06/1997, from the top directory, I ran:
55

6-
find . -name '*.[ch]' -type f -print |grep -v '++' | grep -v '/odbc/' | xargs -n100 pgindent
6+
find . -name '*.[ch]' -type f -print |egrep -v '++|/odbc/|s_lock.h' | xargs -n100 pgindent
77

88
The stock BSD indent has two bugs. First, a comment after the word 'else'
99
causes the rest of the file to be ignored. Second, it silently ignores

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp