win32: rename support files

diff --git a/Makefile b/Makefile
index 776e04b49299e72019213fa7e56ecefd255e067b..2122c2e5591cdf4ae5dc4e355604499fe49f7954 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,8 @@ DATA = README NEWS AUTHORS etc/pgbouncer.ini etc/userlist.txt Makefile \
        test/Makefile test/asynctest.c test/conntest.sh test/ctest6000.ini \
        test/ctest7000.ini test/run-conntest.sh test/stress.py test/test.ini \
        test/test.sh test/userlist.txt etc/example.debian.init.sh doc/fixman.py \
-       win32/wbnmsgevent.mc win32/wbnmsgevent.rc win32/MSG00001.bin
+       win32/eventmsg.mc win32/eventmsg.rc win32/MSG00001.bin \
+       win32/win32support.c win32/win32support.h
 DIRS = doc etc include src debian test
 
 # keep autoconf stuff separate
@@ -32,7 +33,7 @@ hdrs = $(addprefix $(srcdir)/include/, $(HDRS))
 srcs = $(addprefix $(srcdir)/src/, $(SRCS))
 objs = $(addprefix $(builddir)/lib/, $(OBJS))
 FULL = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-DISTFILES = $(DIRS) $(DATA) $(DOCS) $(srcs) $(hdrs) $(MANPAGES) $(WINPORT)
+DISTFILES = $(DIRS) $(DATA) $(DOCS) $(srcs) $(hdrs) $(MANPAGES)
 exe = $(builddir)/pgbouncer$(EXT)
 
 CPPCFLAGS += -I$(srcdir)/include
@@ -50,12 +51,12 @@ ifeq ($(PORTNAME),win32)
 EXT = .exe
 
 CPPFLAGS += -I$(srcdir)/win32
-WSRCS = win32service.c
+WSRCS = win32support.c
+WHDRS = win32support.h
 WOBJS = $(WSRCS:.c=.o)
-WHDRS = win32service.h compat_win32.h
-srcs += $(addprefix $(srcdir)/win32/, $(WSRCS))
-hdrs += $(addprefix $(srcdir)/win32/, $(WHDRS))
-objs += $(addprefix $(builddir)/lib/, $(WOBJS))
+srcs += $(srcdir)/win32/win32support.c
+hdrs += $(srcdir)/win32/win32support.h
+objs += $(builddir)/lib/win32support.o
 
 dll = $(builddir)/pgbevent.dll
 dlldef = $(builddir)/lib/pgbevent.def

diff --git a/include/system.h b/include/system.h
index 993013397f59a1475ef9869142b57df4aa2e9779..146a52bb815cad658a555966cef735a19daf5cf5 100644 (file)
--- a/include/system.h
+++ b/include/system.h
@@ -25,7 +25,7 @@
 #endif
 
 #ifdef WIN32
-#include "compat_win32.h"
+#include "win32support.h"
 #endif
 
 /* glibc is useless without it */

diff --git a/src/util.c b/src/util.c
index 3f54bb12f628b9bc022fedead1325413805a8656..bcc19b604d1bdd6f8e6e480dcd68d3bc477d14fc 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -24,8 +24,6 @@
 
 #ifndef WIN32
 #include <syslog.h>
-#else
-#include "win32service.h"
 #endif
 
 #include "md5.h"

diff --git a/win32/win32service.h b/win32/win32service.h
deleted file mode 100644 (file)
index caec84e..0000000
--- a/win32/win32service.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef WIN32SERVICE
-#define WIN32SERVICE
-/*-------------------------------------------------------------------------
- * win32service.h
- *
- *  Windows service definitions
- *
- *     Copyright (c) 2008, PostgreSQL Global Development Group
- *-------------------------------------------------------------------------
- */
-
-#endif

diff --git a/win32/win32service.c b/win32/win32support.c
similarity index 99%
rename from win32/win32service.c
rename to win32/win32support.c
index c17ac7cde7dfcc27bc12d055e61aa5350ccead3f..34788d5136640a692c81456fc7af51ee6ef0ff50 100644 (file)
--- a/win32/win32service.c
+++ b/win32/win32support.c
@@ -15,8 +15,6 @@
 
 #include "bouncer.h"
 
-#include "win32service.h"
-
 /* forward declarations */
 static void WINAPI win32_servicemain(DWORD argc, LPTSTR * argv);
 static void WINAPI win32_servicehandler(DWORD request);

diff --git a/win32/compat_win32.h b/win32/win32support.h
similarity index 100%
rename from win32/compat_win32.h
rename to win32/win32support.h