From b4c66c8c1b3d816a8ea7194c63b02ca5a74a47ac Mon Sep 17 00:00:00 2001
From: Tomáš Chvátal <scarabeus@gentoo.org>
Date: Thu, 10 Dec 2009 14:22:54 +0100
Subject: Fix module detection. Thx Timoo

---
 src/base/modules.c |  8 +-------
 src/base/modules.h | 12 +++++++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/base')

diff --git a/src/base/modules.c b/src/base/modules.c
index 349ca8a..4290d79 100644
--- a/src/base/modules.c
+++ b/src/base/modules.c
@@ -124,13 +124,7 @@ static void unmapImage(void *image)
 
 static void setModulePath(char *name, char *path)
 {
-	sprintf(path, PATH_MODULES "%s" MODULE_TYPE_UNIX, name);	/* GNU/Linux */
-#ifdef __WIN32__
-	sprintf(path, PATH_MODULES "%s" MODULE_TYPE_WIN, name);		/* MS Windows */
-#endif /* __WIN32__ */
-#ifdef APPLE
-	sprintf(path, PATH_MODULES "%s" MODULE_TYPE_APPLE, name);	/* Apple */
-#endif /* APPLE */
+	sprintf(path, PATH_MODULES "%s" MODULE_TYPE, name);
 }
 
 static module_t *newModule(char *name)
diff --git a/src/base/modules.h b/src/base/modules.h
index a811995..f6cca42 100644
--- a/src/base/modules.h
+++ b/src/base/modules.h
@@ -11,9 +11,15 @@
 #include "image.h"
 #endif /* PUBLIC_SERVER */
 
-#define MODULE_TYPE_UNIX	".so"
-#define MODULE_TYPE_APPLE	".dylib"
-#define MODULE_TYPE_WIN		".dll"
+#ifndef __WIN32__
+	#ifndef APPLE
+		#define MODULE_TYPE	".so"
+	#else
+		#define MODULE_TYPE	".dylib"
+	#endif
+#else
+	#define MODULE_TYPE	".dll"
+#endif
 
 typedef struct export_fce_s {
 	int (*fce_getValue) (char *line, char *env, char *val, int len);
-- 
cgit v1.2.3