summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorPeter Eisentraut2000-01-15 02:59:43 +0000
committerPeter Eisentraut2000-01-15 02:59:43 +0000
commit1cd4c141167131f0739a654c6f703fc1a5154f0f (patch)
tree2459cd9f0bc38d80b6038a877603af9ae3fdb988 /src/include
parent7c9390caa14ea2d5d99d69d2a34eee4d45d43b9c (diff)
Fixed all elog related warnings, as well as a few others.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/port/linux.h2
-rw-r--r--src/include/postgres.h3
-rw-r--r--src/include/storage/lock.h3
-rw-r--r--src/include/utils/int8.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/include/port/linux.h b/src/include/port/linux.h
index 345aac71b1d..b2b4545a2ab 100644
--- a/src/include/port/linux.h
+++ b/src/include/port/linux.h
@@ -29,7 +29,7 @@ typedef unsigned int slock_t;
#endif
-#if (__GLIBC__ >= 2)
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
#ifdef HAVE_INT_TIMEZONE
#undef HAVE_INT_TIMEZONE
#endif
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 455b8f23294..d857613daf1 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1995, Regents of the University of California
*
- * $Id: postgres.h,v 1.34 2000/01/10 16:13:18 momjian Exp $
+ * $Id: postgres.h,v 1.35 2000/01/15 02:59:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -210,6 +210,7 @@ typedef uint32 CommandId;
#define CATALOG(x) \
typedef struct CppConcat(FormData_,x)
+/* Huh? */
#define DATA(x) extern int errno
#define DESCR(x) extern int errno
#define DECLARE_INDEX(x) extern int errno
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 8f0f834e0f4..a8ad7e978d8 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: lock.h,v 1.34 1999/09/06 19:37:37 tgl Exp $
+ * $Id: lock.h,v 1.35 2000/01/15 02:59:42 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -234,7 +234,6 @@ typedef struct LOCK
#define LockLockTable() SpinAcquire(LockMgrLock);
#define UnlockLockTable() SpinRelease(LockMgrLock);
-extern SPINLOCK LockMgrLock;
/*
* function prototypes
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index b55cecf8471..89d328af21d 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: int8.h,v 1.15 2000/01/10 16:13:22 momjian Exp $
+ * $Id: int8.h,v 1.16 2000/01/15 02:59:43 petere Exp $
*
* NOTES
* These data types are supported on all 64-bit architectures, and may
@@ -91,7 +91,7 @@ extern int64 *int48div(int32 val1, int64 *val2);
extern int64 *int48(int32 val);
extern int32 int84(int64 *val);
-#if NOT_USED
+#ifdef NOT_USED
extern int64 *int2vector (int16 val);
extern int16 int82(int64 *val);