diff options
| author | Berke Viktor <berkeviktor@aol.com> | 2011-12-11 18:04:35 +0100 |
|---|---|---|
| committer | Berke Viktor <berkeviktor@aol.com> | 2011-12-11 18:04:35 +0100 |
| commit | 13ee029364b37eca95c43641420e75c872b32653 (patch) | |
| tree | ef13e150cc5d2e15d4c879af644d9ba242c9c182 /src/common | |
| parent | 132ef6cb50201cb6ab8ab0609a88ccce62aa6a21 (diff) | |
some more multiplatform support
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/dirent-win32.c (renamed from src/common/dirent.c) | 2 | ||||
| -rw-r--r-- | src/common/dirent-win32.h (renamed from src/common/dirent.h) | 0 | ||||
| -rw-r--r-- | src/common/makefile.mak | 10 | ||||
| -rw-r--r-- | src/common/plugin.c | 4 | ||||
| -rw-r--r-- | src/common/util.c | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/src/common/dirent.c b/src/common/dirent-win32.c index a84f1b65..273c6732 100644 --- a/src/common/dirent.c +++ b/src/common/dirent-win32.c @@ -56,7 +56,7 @@ * First version. *****************************************************************************/ -#include "dirent.h" +#include "dirent-win32.h" /* Use the new safe string functions introduced in Visual Studio 2005 */ #if defined(_MSC_VER) && _MSC_VER >= 1400 diff --git a/src/common/dirent.h b/src/common/dirent-win32.h index cbb753e6..cbb753e6 100644 --- a/src/common/dirent.h +++ b/src/common/dirent-win32.h diff --git a/src/common/makefile.mak b/src/common/makefile.mak index 8b350efc..f78a6d8d 100644 --- a/src/common/makefile.mak +++ b/src/common/makefile.mak @@ -5,7 +5,7 @@ cfgfiles.obj \ chanopt.obj \ ctcp.obj \ dcc.obj \ -dirent.obj \ +dirent-win32.obj \ history.obj \ ignore.obj \ inbound.obj \ @@ -27,13 +27,13 @@ userlist.obj \ util.obj \ xchat.obj -all: $(COMMON_OBJECTS) xchatcommon.lib dirent.lib +all: $(COMMON_OBJECTS) xchatcommon.lib dirent-win32.lib xchatcommon.lib: $(COMMON_OBJECTS) lib /nologo /out:xchatcommon.lib $(COMMON_OBJECTS) -dirent.lib: dirent.obj - lib /nologo /out:dirent.lib dirent.obj +dirent-win32.lib: dirent-win32.obj + lib /nologo /out:dirent-win32.lib dirent-win32.obj .c.obj:: $(CC) $(CFLAGS) $(GLIB) $< @@ -41,4 +41,4 @@ dirent.lib: dirent.obj clean: @del *.obj @del xchatcommon.lib - @del dirent.lib + @del dirent-win32.lib diff --git a/src/common/plugin.c b/src/common/plugin.c index ccb64e93..5ed20b87 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -1008,7 +1008,11 @@ xchat_get_info (xchat_plugin *ph, const char *id) return XCHATLIBDIR; case 0x14f51cd8: /* version */ +#ifdef WIN32 return XCHAT_RELEASE; +#else + return PACKAGE_VERSION; +#endif case 0xdd9b1abd: /* xchatdir */ return get_xdir_utf8 (); diff --git a/src/common/util.c b/src/common/util.c index ccc48657..51222e40 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -32,7 +32,7 @@ #include <sys/timeb.h> #include <process.h> #include <io.h> -#include "dirent.h" +#include "dirent-win32.h" #else #include <unistd.h> #include <pwd.h> |