aboutsummaryrefslogtreecommitdiff
path: root/src/backend/port/dynloader
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2001-10-28 06:26:15 +0000
committerBruce Momjian <bruce@momjian.us>2001-10-28 06:26:15 +0000
commit6783b2372ef13c141649840a836ff0a954ea1d4d (patch)
tree81c727b2b08930bcf3ab7107c84ef59f1f68a78d /src/backend/port/dynloader
parentc29797deeb5dfca61b8959344b682b4c32fe53a1 (diff)
downloadpostgresql-6783b2372ef13c141649840a836ff0a954ea1d4d.tar.gz
postgresql-6783b2372ef13c141649840a836ff0a954ea1d4d.zip
Another pgindent run. Fixes enum indenting, and improves #endif
spacing. Also adds space for one-line comments.
Diffstat (limited to 'src/backend/port/dynloader')
-rw-r--r--src/backend/port/dynloader/aix.c1
-rw-r--r--src/backend/port/dynloader/aix.h4
-rw-r--r--src/backend/port/dynloader/bsdi.c3
-rw-r--r--src/backend/port/dynloader/bsdi.h1
-rw-r--r--src/backend/port/dynloader/dgux.h3
-rw-r--r--src/backend/port/dynloader/freebsd.h3
-rw-r--r--src/backend/port/dynloader/irix5.h1
-rw-r--r--src/backend/port/dynloader/linux.c3
-rw-r--r--src/backend/port/dynloader/linux.h3
-rw-r--r--src/backend/port/dynloader/netbsd.h3
-rw-r--r--src/backend/port/dynloader/nextstep.h1
-rw-r--r--src/backend/port/dynloader/openbsd.h3
-rw-r--r--src/backend/port/dynloader/osf.h3
-rw-r--r--src/backend/port/dynloader/sco.h3
-rw-r--r--src/backend/port/dynloader/solaris.h3
-rw-r--r--src/backend/port/dynloader/sunos4.h3
-rw-r--r--src/backend/port/dynloader/svr4.h3
-rw-r--r--src/backend/port/dynloader/ultrix4.h9
-rw-r--r--src/backend/port/dynloader/univel.h1
-rw-r--r--src/backend/port/dynloader/unixware.h1
-rw-r--r--src/backend/port/dynloader/win.h1
21 files changed, 39 insertions, 17 deletions
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 46ef63a766d..a8fd72ff4cc 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -607,4 +607,5 @@ findMain(void)
free(buf);
return ret;
}
+
#endif /* HAVE_DLOPEN */
diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h
index 203e56264a1..88f9592aad5 100644
--- a/src/backend/port/dynloader/aix.h
+++ b/src/backend/port/dynloader/aix.h
@@ -1,5 +1,5 @@
/*
- * $Id: aix.h,v 1.7 2001/10/25 05:49:40 momjian Exp $
+ * $Id: aix.h,v 1.8 2001/10/28 06:25:47 momjian Exp $
*
* @(#)dlfcn.h 1.4 revision of 95/04/25 09:36:52
* This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
@@ -42,6 +42,7 @@ extern "C"
void *dlsym(void *handle, const char *symbol);
char *dlerror(void);
int dlclose(void *handle);
+
#else
void *dlopen();
void *dlsym();
@@ -60,4 +61,5 @@ extern "C"
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index c16af323a1e..adfe9bb06dc 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.16 2001/10/25 05:49:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.17 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -94,4 +94,5 @@ pg_dlerror()
{
return dld_strerror(dld_errno);
}
+
#endif /* not HAVE_DLOPEN */
diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h
index 7d38de82779..7d4c1ec7f9d 100644
--- a/src/backend/port/dynloader/bsdi.h
+++ b/src/backend/port/dynloader/bsdi.h
@@ -33,4 +33,5 @@ do { \
free(handle); \
} while (0)
#endif /* not HAVE_DLOPEN */
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h
index 8246906702b..b7b5d576eee 100644
--- a/src/backend/port/dynloader/dgux.h
+++ b/src/backend/port/dynloader/dgux.h
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: dgux.h,v 1.11 2001/10/25 05:49:40 momjian Exp $
+ * $Id: dgux.h,v 1.12 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,4 +27,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h
index c7e36525ac3..022be0f39b9 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: freebsd.h,v 1.11 2001/10/25 05:49:40 momjian Exp $
+ * $Id: freebsd.h,v 1.12 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,4 +43,5 @@ char *BSD44_derived_dlerror(void);
void *BSD44_derived_dlopen(const char *filename, int num);
void *BSD44_derived_dlsym(void *handle, const char *name);
void BSD44_derived_dlclose(void *handle);
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix5.h
index f5e53bfc1b4..a4a5d134b6c 100644
--- a/src/backend/port/dynloader/irix5.h
+++ b/src/backend/port/dynloader/irix5.h
@@ -30,4 +30,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 796f22d3f21..565464c993a 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.19 2001/10/25 05:49:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.20 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -107,4 +107,5 @@ pg_dlerror()
return dld_strerror(dld_errno);
#endif
}
+
#endif
diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h
index 2077a6a6765..e0955deb5c2 100644
--- a/src/backend/port/dynloader/linux.h
+++ b/src/backend/port/dynloader/linux.h
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: linux.h,v 1.14 2001/10/25 05:49:40 momjian Exp $
+ * $Id: linux.h,v 1.15 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,4 +40,5 @@ do { \
#define pg_dlclose dlclose
#define pg_dlerror dlerror
#endif /* HAVE_DLOPEN */
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h
index 85cdfa3a85f..aa516053a53 100644
--- a/src/backend/port/dynloader/netbsd.h
+++ b/src/backend/port/dynloader/netbsd.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: netbsd.h,v 1.6 2001/10/25 05:49:40 momjian Exp $
+ * $Id: netbsd.h,v 1.7 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -43,4 +43,5 @@ char *BSD44_derived_dlerror(void);
void *BSD44_derived_dlopen(const char *filename, int num);
void *BSD44_derived_dlsym(void *handle, const char *name);
void BSD44_derived_dlclose(void *handle);
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/nextstep.h b/src/backend/port/dynloader/nextstep.h
index 510243a1ac9..d86c2c5cea1 100644
--- a/src/backend/port/dynloader/nextstep.h
+++ b/src/backend/port/dynloader/nextstep.h
@@ -22,4 +22,5 @@ char *next_dlerror(void);
#define pg_dlerror next_dlerror
/* port.c */
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h
index 899f2130115..c08c8b3b917 100644
--- a/src/backend/port/dynloader/openbsd.h
+++ b/src/backend/port/dynloader/openbsd.h
@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: openbsd.h,v 1.7 2001/10/25 05:49:40 momjian Exp $
+ * $Id: openbsd.h,v 1.8 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,4 +41,5 @@ char *BSD44_derived_dlerror(void);
void *BSD44_derived_dlopen(const char *filename, int num);
void *BSD44_derived_dlsym(void *handle, const char *name);
void BSD44_derived_dlclose(void *handle);
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h
index e24ae4f85da..d411a895b15 100644
--- a/src/backend/port/dynloader/osf.h
+++ b/src/backend/port/dynloader/osf.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: osf.h,v 1.4 2001/10/25 05:49:40 momjian Exp $
+ * $Id: osf.h,v 1.5 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,4 +32,5 @@
#define pg_dlsym(h, f) ((PGFunction) dlsym(h, f))
#define pg_dlclose(h) dlclose(h)
#define pg_dlerror() dlerror()
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h
index 577706d27e0..c7db92d3e67 100644
--- a/src/backend/port/dynloader/sco.h
+++ b/src/backend/port/dynloader/sco.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: sco.h,v 1.9 2001/10/25 05:49:40 momjian Exp $
+ * $Id: sco.h,v 1.10 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,4 +32,5 @@
#define pg_dlerror dlerror
/* port.c */
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h
index ca920923c4b..cc6b4dc776f 100644
--- a/src/backend/port/dynloader/solaris.h
+++ b/src/backend/port/dynloader/solaris.h
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.5 2001/10/25 05:49:40 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.6 2001/10/28 06:25:47 momjian Exp $ */
#ifndef DYNLOADER_SOLARIS_H
#define DYNLOADER_SOLARIS_H
@@ -10,4 +10,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* DYNLOADER_SOLARIS_H */
diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h
index fee5f00a3be..f1e74afd47b 100644
--- a/src/backend/port/dynloader/sunos4.h
+++ b/src/backend/port/dynloader/sunos4.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: sunos4.h,v 1.9 2001/10/25 05:49:40 momjian Exp $
+ * $Id: sunos4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,4 +30,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h
index af3d6d54f98..abce7465a53 100644
--- a/src/backend/port/dynloader/svr4.h
+++ b/src/backend/port/dynloader/svr4.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: svr4.h,v 1.9 2001/10/25 05:49:40 momjian Exp $
+ * $Id: svr4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,4 +30,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* DYNLOADER_H */
diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h
index 68504d0ac26..18edf7e0ba6 100644
--- a/src/backend/port/dynloader/ultrix4.h
+++ b/src/backend/port/dynloader/ultrix4.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: ultrix4.h,v 1.8 2001/10/25 05:49:40 momjian Exp $
+ * $Id: ultrix4.h,v 1.9 2001/10/28 06:25:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,9 +55,9 @@ typedef struct ScnInfo
typedef enum
{
- DL_NEEDRELOC, /* still need relocation */
- DL_RELOCATED, /* no relocation necessary */
- DL_INPROG /* relocation in progress */
+ DL_NEEDRELOC, /* still need relocation */
+ DL_RELOCATED, /* no relocation necessary */
+ DL_INPROG /* relocation in progress */
} dlRStatus;
typedef struct JmpTbl
@@ -120,4 +120,5 @@ extern char *dl_error( /* void */ );
extern char **dl_undefinedSymbols( /* int *count */ );
extern void dl_printAllSymbols( /* void *handle */ );
extern void dl_setLibraries( /* char *libs */ );
+
#endif /* _DL_HEADER_ */
diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h
index 694d87c3fae..83f0e2c82a5 100644
--- a/src/backend/port/dynloader/univel.h
+++ b/src/backend/port/dynloader/univel.h
@@ -30,4 +30,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h
index 0d0b80721dc..5c1b04cc694 100644
--- a/src/backend/port/dynloader/unixware.h
+++ b/src/backend/port/dynloader/unixware.h
@@ -30,4 +30,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/win.h b/src/backend/port/dynloader/win.h
index 0bc8cdb0624..d0d33189b79 100644
--- a/src/backend/port/dynloader/win.h
+++ b/src/backend/port/dynloader/win.h
@@ -30,4 +30,5 @@
#define pg_dlsym dlsym
#define pg_dlclose dlclose
#define pg_dlerror dlerror
+
#endif /* PORT_PROTOS_H */