summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorBruce Momjian1998-09-11 16:56:24 +0000
committerBruce Momjian1998-09-11 16:56:24 +0000
commitf1ab71ec5f2614540587282bcaa4dad44a54efa7 (patch)
tree9329e0bbd635d259f41403b6075a9aeb279ca05a /src/include
parent339d2769a1ba86b292bcef5c3903766ae256538b (diff)
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
Diffstat (limited to 'src/include')
-rw-r--r--src/include/storage/s_lock.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index a475d21274f..2a0c31cd9f2 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
*
*
* 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
tas(slock_t *s_lock)
{
- %mem s_lock
- pushl % ebx
+/* UNIVEL wants %mem in column 1, so we don't pg_indent this file */
+%mem s_lock
+ pushl %ebx
movl s_lock, %ebx
movl $255, %eax
lock
- xchgb % al, (%ebx)
- popl % ebx
+ xchgb %al, (%ebx)
+ popl %ebx
}
#endif /* USE_UNIVEL_CC */