Merge r21-4-11-chise-0_20-=ucs.

[chise/xemacs-chise.git.1] / src / postgresql.h

diff --git a/src/postgresql.h b/src/postgresql.h
index e13d96a..acfda83 100644 (file)
--- a/src/postgresql.h
+++ b/src/postgresql.h
@@ -10,10 +10,12 @@ Please send patches to this file to me first before submitting them to
 xemacs-patches.
 */
 
-#ifndef XEMACS_POSTGRESQL_H__
-#define XEMACS_POSTGRESQL_H__ 1
+#ifndef INCLUDED_postgresql_h_
+#define INCLUDED_postgresql_h_ 1
 
-#define BLCKSZ 8192 /* size of a default Postres disk block */
+#include LIBPQ_FE_H_FILE /* main PostgreSQL header file */
+
+#define BLCKSZ 8192 /* size of a default Postgres disk block */
 /*
   This file contains the GCC bug workaround code for the private
   LRECORD types.
@@ -57,31 +59,4 @@ DECLARE_LRECORD (pgresult, Lisp_PGresult);
 #define CHECK_PGRESULT(x) CHECK_RECORD (x, pgresult)
 #define CONCHECK_PGRESULT(x) CONCHECK_RECORD (x, pgresult)
 
-/****/
-#ifdef HAVE_POSTGRESQLV7
-
-#ifdef LIBPQ_7_0_IS_FIXED /* this is broken in released 7.0b1 */
-
-/* PGsetenvHandle is an opaque object and we need to be able to store
-   them in Lisp code in order to make asynchronous environment calls.
-*/
-struct Lisp_PGsetenvHandle
-{
-  struct lcrecord_header header;
-  PGsetenvHandle *pgsetenv;
-};
-typedef struct Lisp_PGsetenvHandle Lisp_PGsetenvHandle;
-
-DECLARE_LRECORD (pgsetenv, Lisp_PGsetenvHandle);
-
-#define XPGSETENV(x) XRECORD (x, pgsetenv, Lisp_PGsetenvHandle)
-#define XSETPGSETENV(x, p) XSETRECORD (x, p, pgsetenv)
-#define PGSETENVP(x) RECORDP (x, pgsetenv)
-#define CHECK_PGSETENV(x) CHECK_RECORD (x, pgsetenv)
-#define CONCHECK_PGSETENV(x) CONCHECK_RECORD (x, pgsetenv)
-
-#endif /* LIBPQ_7_0_IS_FIXED */
-
-#endif /* HAVE_POSTGRESQLV7 */
-
-#endif /* XEMACS_POSTGRESQL_H__ */
+#endif /* INCLUDED_postgresql_h_ */