diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-23 01:37:16 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-23 01:37:16 +0000 |
| commit | ca9eab23b34f2fe839aea1ef90673e1d3f73c533 (patch) | |
| tree | eea6eb4fe7fbabda1c9511941921eaef1d1a3755 /src/plugins | |
| parent | d08465093859b1df55f66bcbd31e0c4d9e392132 (diff) | |
| download | hercules-ca9eab23b34f2fe839aea1ef90673e1d3f73c533.tar.gz hercules-ca9eab23b34f2fe839aea1ef90673e1d3f73c533.tar.bz2 hercules-ca9eab23b34f2fe839aea1ef90673e1d3f73c533.tar.xz hercules-ca9eab23b34f2fe839aea1ef90673e1d3f73c533.zip | |
- Fixed a compilation problem with the pid plugin
- Some minor cleanups
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10322 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Makefile | 2 | ||||
| -rw-r--r-- | src/plugins/pid.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/plugins/Makefile b/src/plugins/Makefile index f576995f6..bac69f70f 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -14,13 +14,11 @@ txt sql all: $(PLUGINS) %.$(PLUGINEXT): %.c $(CC) $(CFLAGS) -shared -o ../../plugins/$@ $< - @touch $@ sig.$(PLUGINEXT): sig.c $(CC) $(CFLAGS) -shared -o ../../plugins/$@ $< \ ../common/obj/showmsg.o ../common/obj/utils.o \ ../common/obj/minimalloc.o - @touch $@ gui.$(PLUGINEXT): ../../plugins/gui.conf upnp.$(PLUGINEXT): ../../plugins/upnp.conf diff --git a/src/plugins/pid.c b/src/plugins/pid.c index 2fdd2570c..48013e3eb 100644 --- a/src/plugins/pid.c +++ b/src/plugins/pid.c @@ -2,13 +2,10 @@ #include <stdio.h> #include <string.h> -#ifndef _WIN32 - #include <unistd.h> -#endif -#ifdef MINGW - #include <process.h> - #include <io.h> +#if !defined _WIN32 || defined MINGW + #include <unistd.h> // getpid(), unlink() #else + #include <windows.h> #define getpid GetCurrentProcessId #endif |