aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Schulz <[email protected]>2003-08-14 12:16:58 +0000
committerTimo Schulz <[email protected]>2003-08-14 12:16:58 +0000
commitf099ed75b84dcafb02c8dbebe885ea3e76e26cb7 (patch)
tree8098da6bdff29e08a220328d4b6d39c8ab65638f
parent2003-08-14 Timo Schulz <[email protected]> (diff)
downloadgnupg-f099ed75b84dcafb02c8dbebe885ea3e76e26cb7.tar.gz
gnupg-f099ed75b84dcafb02c8dbebe885ea3e76e26cb7.zip
*** empty log message ***
-rw-r--r--common/ChangeLog2
-rw-r--r--common/dynload.h (renamed from common/dlfcn.h)12
2 files changed, 6 insertions, 8 deletions
diff --git a/common/ChangeLog b/common/ChangeLog
index 67f53f50b..6666b5941 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,6 +1,6 @@
2003-08-14 Timo Schulz <[email protected]>
- * dlfcn.h. New. W32 wrapper around the dynload mechanism.
+ * dynload.h. New. W32 wrapper around the dynload mechanism.
2003-07-15 Werner Koch <[email protected]>
diff --git a/common/dlfcn.h b/common/dynload.h
index c88bf3be9..d2df5f017 100644
--- a/common/dlfcn.h
+++ b/common/dynload.h
@@ -18,12 +18,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifndef GNUPG_DYNLOAD_H
+#define GNUPG_DYNLOAD_H
#ifndef __MINGW32__
-#include <dlfcn.h> /* include the actual header file */
+#include <dlfcn.h>
#else
-#ifndef W32_DLFCN_H
-#define W32_DLFCN_H
-
#include <windows.h>
static __inline__ void *
@@ -66,6 +65,5 @@ dlclose (void * hd)
}
return -1;
}
-
-#endif /*W32_DLFCN_H*/
-#endif
+#endif /*__MINGW32__*/
+#endif /*GNUPG_DYNLOAD_H*/