Log Message:
-----------
Recover back to previous #includes - the changes made should only 
go into CVS HEAD for future usage.

Tags:
----
REL_1_2_STABLE

Modified Files:
--------------
    slony1-engine/src/slon:
        cleanup_thread.c (r1.33.2.1 -> r1.33.2.2)
        conf-file.l (r1.5.2.1 -> r1.5.2.2)
        confoptions.c (r1.17.2.2 -> r1.17.2.3)
        confoptions.h (r1.31.2.1 -> r1.31.2.2)
        dbutils.c (r1.23.2.1 -> r1.23.2.2)
        local_listen.c (r1.38.2.1 -> r1.38.2.2)
        misc.c (r1.22.2.1 -> r1.22.2.2)
        misc.h (r1.7.2.1 -> r1.7.2.2)
        remote_listen.c (r1.31.2.1 -> r1.31.2.2)
        remote_worker.c (r1.124.2.4 -> r1.124.2.5)
        runtime_config.c (r1.27.2.1 -> r1.27.2.2)
        scheduler.c (r1.24.2.1 -> r1.24.2.2)
        slon.c (r1.66.2.1 -> r1.66.2.2)
        slon.h (r1.59.2.2 -> r1.59.2.3)
        snmp_thread.c (r1.3.2.1 -> r1.3.2.2)
        sync_thread.c (r1.17.2.1 -> r1.17.2.2)

-------------- next part --------------
Index: misc.h
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/misc.h,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -Lsrc/slon/misc.h -Lsrc/slon/misc.h -u -w -r1.7.2.1 -r1.7.2.2
--- src/slon/misc.h
+++ src/slon/misc.h
@@ -4,6 +4,9 @@
  * Functions in misc.c
  * ----------
  */
+#include "config.h"
+#include "c.h"
+
 
 typedef enum
 {
Index: confoptions.h
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.h,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -Lsrc/slon/confoptions.h -Lsrc/slon/confoptions.h -u -w -r1.31.2.1 -r1.31.2.2
--- src/slon/confoptions.h
+++ src/slon/confoptions.h
@@ -1,6 +1,8 @@
 #ifndef _CONFOPTIONS_H_
 #define _CONFOPTIONS_H_
 
+#include "c.h"
+
 void		InitializeConfOptions(void);
 
 bool		set_config_option(const char *name, const char *value);
Index: scheduler.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/scheduler.c,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -Lsrc/slon/scheduler.c -Lsrc/slon/scheduler.c -u -w -r1.24.2.1 -r1.24.2.2
--- src/slon/scheduler.c
+++ src/slon/scheduler.c
@@ -23,6 +23,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include "libpq-fe.h"
+#include "c.h"
+
 #include "slon.h"
 
 
Index: snmp_thread.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/snmp_thread.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -Lsrc/slon/snmp_thread.c -Lsrc/slon/snmp_thread.c -u -w -r1.3.2.1 -r1.3.2.2
--- src/slon/snmp_thread.c
+++ src/slon/snmp_thread.c
@@ -6,6 +6,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include "libpq-fe.h"
+#include "c.h"
 #include "slon.h"
 
 #include <net-snmp/net-snmp-includes.h>
Index: remote_worker.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.124.2.4
retrieving revision 1.124.2.5
diff -Lsrc/slon/remote_worker.c -Lsrc/slon/remote_worker.c -u -w -r1.124.2.4 -r1.124.2.5
--- src/slon/remote_worker.c
+++ src/slon/remote_worker.c
@@ -21,8 +21,11 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
-
+#include "libpq-fe.h"
+#include "c.h"
 #include "slon.h"
+#include "confoptions.h"
+
 #include "../parsestatements/scanner.h"
 extern int STMTS[MAXSTATEMENTS];
 
Index: remote_listen.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/remote_listen.c,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -Lsrc/slon/remote_listen.c -Lsrc/slon/remote_listen.c -u -w -r1.31.2.1 -r1.31.2.2
--- src/slon/remote_listen.c
+++ src/slon/remote_listen.c
@@ -23,6 +23,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "libpq-fe.h"
+#include "c.h"
+
 #include "slon.h"
 
 
Index: sync_thread.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/sync_thread.c,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -Lsrc/slon/sync_thread.c -Lsrc/slon/sync_thread.c -u -w -r1.17.2.1 -r1.17.2.2
--- src/slon/sync_thread.c
+++ src/slon/sync_thread.c
@@ -22,6 +22,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "libpq-fe.h"
+#include "c.h"
+
 #include "slon.h"
 
 
Index: slon.h
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/slon.h,v
retrieving revision 1.59.2.2
retrieving revision 1.59.2.3
diff -Lsrc/slon/slon.h -Lsrc/slon/slon.h -u -w -r1.59.2.2 -r1.59.2.3
--- src/slon/slon.h
+++ src/slon/slon.h
@@ -14,11 +14,8 @@
 #define SLON_H_INCLUDED
 
 #include "config.h"
-#include "libpq-fe.h"
-#include "postgres_fe.h"
 #include "misc.h"
 #include "conf-file.h"
-#include "confoptions.h"
 
 #define SLON_MEMDEBUG	1
 
Index: runtime_config.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/runtime_config.c,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -Lsrc/slon/runtime_config.c -Lsrc/slon/runtime_config.c -u -w -r1.27.2.1 -r1.27.2.2
--- src/slon/runtime_config.c
+++ src/slon/runtime_config.c
@@ -23,6 +23,8 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "libpq-fe.h"
+#include "c.h"
 #include "slon.h"
 
 
Index: misc.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/misc.c,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -Lsrc/slon/misc.c -Lsrc/slon/misc.c -u -w -r1.22.2.1 -r1.22.2.2
--- src/slon/misc.c
+++ src/slon/misc.c
@@ -31,6 +31,11 @@
 #endif
 #include <stdarg.h>
 
+#include "libpq-fe.h"
+#include "c.h"
+
+#include "confoptions.h"
+
 #include "slon.h"
 
 
Index: local_listen.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/local_listen.c,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -Lsrc/slon/local_listen.c -Lsrc/slon/local_listen.c -u -w -r1.38.2.1 -r1.38.2.2
--- src/slon/local_listen.c
+++ src/slon/local_listen.c
@@ -23,6 +23,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "libpq-fe.h"
+#include "c.h"
+
 #include "slon.h"
 
 
Index: cleanup_thread.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/cleanup_thread.c,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -Lsrc/slon/cleanup_thread.c -Lsrc/slon/cleanup_thread.c -u -w -r1.33.2.1 -r1.33.2.2
--- src/slon/cleanup_thread.c
+++ src/slon/cleanup_thread.c
@@ -22,6 +22,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "libpq-fe.h"
+#include "c.h"
+
 #include "slon.h"
 
 
Index: conf-file.l
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/conf-file.l,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -Lsrc/slon/conf-file.l -Lsrc/slon/conf-file.l -u -w -r1.5.2.1 -r1.5.2.2
--- src/slon/conf-file.l
+++ src/slon/conf-file.l
@@ -12,7 +12,8 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "slon.h"
+#include "misc.h"
+#include "confoptions.h"
 
 
 #define CONFIG_FILENAME "./slon.conf"
Index: confoptions.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/confoptions.c,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -Lsrc/slon/confoptions.c -Lsrc/slon/confoptions.c -u -w -r1.17.2.2 -r1.17.2.3
--- src/slon/confoptions.c
+++ src/slon/confoptions.c
@@ -1,7 +1,10 @@
 #include <pthread.h>
 #include <string.h>
 #include <errno.h>
-#include "slon.h"
+#include "libpq-fe.h"
+#include "confoptions.h"
+#include "postgres.h"
+#include "misc.h"
 
 #ifdef qsort 
 #undef qsort 
Index: dbutils.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/dbutils.c,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -Lsrc/slon/dbutils.c -Lsrc/slon/dbutils.c -u -w -r1.23.2.1 -r1.23.2.2
--- src/slon/dbutils.c
+++ src/slon/dbutils.c
@@ -23,6 +23,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "libpq-fe.h"
+#include "c.h"
+
 #include "slon.h"
 
 
Index: slon.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/slon.c,v
retrieving revision 1.66.2.1
retrieving revision 1.66.2.2
diff -Lsrc/slon/slon.c -Lsrc/slon/slon.c -u -w -r1.66.2.1 -r1.66.2.2
--- src/slon/slon.c
+++ src/slon/slon.c
@@ -29,7 +29,12 @@
 #include "port/win32service.h"
 #endif
 
+#include "libpq-fe.h"
+#include "c.h"
+ 
 #include "slon.h"
+#include "confoptions.h"
+
 
 
 /* ----------