tAdd contributed patch to fix build with OpenWRT and to write the server pidfil… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 3486d22aaf34fec2240c5021ee21d13f836fa9c4 | |
parent dffa361c54698aa4f7bfa45eef122c3add5157f4 | |
Author: Ben Webb <[email protected]> | |
Date: Wed, 20 Aug 2008 16:33:30 +0000 | |
Add contributed patch to fix build with OpenWRT and to write the server pidfile | |
after the fork. | |
Diffstat: | |
M ChangeLog | 4 +++- | |
M src/Makefile.am | 2 +- | |
M src/serverside.c | 2 +- | |
3 files changed, 5 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/ChangeLog b/ChangeLog | |
t@@ -1,4 +1,6 @@ | |
-CVS | |
+SVN | |
+ - Fixes to build with OpenWRT (thanks to Theodor-Iulian Ciobanu). | |
+ - Write server pidfile after fork (thanks to Theodor-Iulian Ciobanu). | |
- Updated German and French Canadian translations from Benjamin Karaca | |
and Francois Marier. | |
- Support for old GTK1 and GLIB1 libraries removed - we now need version 2 | |
diff --git a/src/Makefile.am b/src/Makefile.am | |
t@@ -1,7 +1,7 @@ | |
# Nasty hack; there seems to be no other way of disabling libtool for the | |
# link of the main executable... | |
if PLUGINS | |
-MYLINK = $(LIBTOOL) --mode=link $(CCLD) | |
+MYLINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) | |
else | |
MYLINK = $(CCLD) | |
endif | |
diff --git a/src/serverside.c b/src/serverside.c | |
t@@ -831,7 +831,6 @@ static gboolean StartServer(void) | |
Scanner = g_scanner_new(&ScannerConfig); | |
Scanner->msg_handler = ScannerErrorHandler; | |
Scanner->input_name = "(stdin)"; | |
- CreatePidFile(); | |
/* Make the output line-buffered, so that the log file (if used) is | |
* updated regularly */ | |
t@@ -1186,6 +1185,7 @@ void ServerLoop(struct CMDLINE *cmdline) | |
if (Daemonize && fork() > 0) | |
return; | |
#endif | |
+ CreatePidFile(); | |
#ifndef CYGWIN | |
localsock = SetupLocalSocket(); |