Log Message:
-----------
Changed structuring of #includes to simplify things

Modified Files:
--------------
    slony1-engine/src/slon:
        cleanup_thread.c (r1.33 -> r1.34)
        conf-file.l (r1.5 -> r1.6)
        confoptions.c (r1.18 -> r1.19)
        confoptions.h (r1.31 -> r1.32)
        dbutils.c (r1.23 -> r1.24)
        local_listen.c (r1.38 -> r1.39)
        misc.c (r1.22 -> r1.23)
        misc.h (r1.7 -> r1.8)
        remote_listen.c (r1.31 -> r1.32)
        remote_worker.c (r1.127 -> r1.128)
        runtime_config.c (r1.27 -> r1.28)
        scheduler.c (r1.24 -> r1.25)
        slon.c (r1.66 -> r1.67)
        slon.h (r1.60 -> r1.61)
        snmp_thread.c (r1.3 -> r1.4)
        sync_thread.c (r1.17 -> r1.18)

-------------- next part --------------
Index: misc.h
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/misc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/slon/misc.h -Lsrc/slon/misc.h -u -w -r1.7 -r1.8
--- src/slon/misc.h
+++ src/slon/misc.h
@@ -4,8 +4,6 @@
  * 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
retrieving revision 1.32
diff -Lsrc/slon/confoptions.h -Lsrc/slon/confoptions.h -u -w -r1.31 -r1.32
--- src/slon/confoptions.h
+++ src/slon/confoptions.h
@@ -1,9 +1,6 @@
 #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
retrieving revision 1.25
diff -Lsrc/slon/scheduler.c -Lsrc/slon/scheduler.c -u -w -r1.24 -r1.25
--- src/slon/scheduler.c
+++ src/slon/scheduler.c
@@ -23,9 +23,6 @@
 #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
retrieving revision 1.4
diff -Lsrc/slon/snmp_thread.c -Lsrc/slon/snmp_thread.c -u -w -r1.3 -r1.4
--- src/slon/snmp_thread.c
+++ src/slon/snmp_thread.c
@@ -6,9 +6,6 @@
 #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.127
retrieving revision 1.128
diff -Lsrc/slon/remote_worker.c -Lsrc/slon/remote_worker.c -u -w -r1.127 -r1.128
--- src/slon/remote_worker.c
+++ src/slon/remote_worker.c
@@ -22,11 +22,7 @@
 #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
retrieving revision 1.32
diff -Lsrc/slon/remote_listen.c -Lsrc/slon/remote_listen.c -u -w -r1.31 -r1.32
--- src/slon/remote_listen.c
+++ src/slon/remote_listen.c
@@ -23,9 +23,6 @@
 #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
retrieving revision 1.18
diff -Lsrc/slon/sync_thread.c -Lsrc/slon/sync_thread.c -u -w -r1.17 -r1.18
--- src/slon/sync_thread.c
+++ src/slon/sync_thread.c
@@ -22,9 +22,6 @@
 #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.60
retrieving revision 1.61
diff -Lsrc/slon/slon.h -Lsrc/slon/slon.h -u -w -r1.60 -r1.61
--- src/slon/slon.h
+++ src/slon/slon.h
@@ -13,10 +13,12 @@
 #ifndef SLON_H_INCLUDED
 #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
retrieving revision 1.28
diff -Lsrc/slon/runtime_config.c -Lsrc/slon/runtime_config.c -u -w -r1.27 -r1.28
--- src/slon/runtime_config.c
+++ src/slon/runtime_config.c
@@ -23,9 +23,6 @@
 #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
retrieving revision 1.23
diff -Lsrc/slon/misc.c -Lsrc/slon/misc.c -u -w -r1.22 -r1.23
--- src/slon/misc.c
+++ src/slon/misc.c
@@ -31,10 +31,6 @@
 #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
retrieving revision 1.39
diff -Lsrc/slon/local_listen.c -Lsrc/slon/local_listen.c -u -w -r1.38 -r1.39
--- src/slon/local_listen.c
+++ src/slon/local_listen.c
@@ -23,9 +23,6 @@
 #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
retrieving revision 1.34
diff -Lsrc/slon/cleanup_thread.c -Lsrc/slon/cleanup_thread.c -u -w -r1.33 -r1.34
--- src/slon/cleanup_thread.c
+++ src/slon/cleanup_thread.c
@@ -22,9 +22,6 @@
 #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
retrieving revision 1.6
diff -Lsrc/slon/conf-file.l -Lsrc/slon/conf-file.l -u -w -r1.5 -r1.6
--- src/slon/conf-file.l
+++ src/slon/conf-file.l
@@ -12,8 +12,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "misc.h"
-#include "confoptions.h"
+#include "slon.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.18
retrieving revision 1.19
diff -Lsrc/slon/confoptions.c -Lsrc/slon/confoptions.c -u -w -r1.18 -r1.19
--- src/slon/confoptions.c
+++ src/slon/confoptions.c
@@ -1,10 +1,11 @@
 #include <pthread.h>
 #include <string.h>
 #include <errno.h>
-#include "libpq-fe.h"
-#include "confoptions.h"
-#include "misc.h"
+#include "slon.h"
 
+#ifdef qsort 
+#undef qsort 
+#endif
 
 static struct config_generic **conf_variables;
 static int	size_conf_variables;
Index: dbutils.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/dbutils.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/slon/dbutils.c -Lsrc/slon/dbutils.c -u -w -r1.23 -r1.24
--- src/slon/dbutils.c
+++ src/slon/dbutils.c
@@ -23,9 +23,6 @@
 #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
retrieving revision 1.67
diff -Lsrc/slon/slon.c -Lsrc/slon/slon.c -u -w -r1.66 -r1.67
--- src/slon/slon.c
+++ src/slon/slon.c
@@ -29,11 +29,7 @@
 #include "port/win32service.h"
 #endif
 
-#include "libpq-fe.h"
-#include "c.h"
-
 #include "slon.h"
-#include "confoptions.h"
 
 
 /* ----------