From f099ed75b84dcafb02c8dbebe885ea3e76e26cb7 Mon Sep 17 00:00:00 2001
From: Timo Schulz <twoaday@freakmail.de>
Date: Thu, 14 Aug 2003 12:16:58 +0000
Subject: *** empty log message ***

---
 common/ChangeLog |  2 +-
 common/dlfcn.h   | 71 --------------------------------------------------------
 common/dynload.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 72 deletions(-)
 delete mode 100644 common/dlfcn.h
 create mode 100644 common/dynload.h

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  <twoaday@freakmail.de>
 
-	* dlfcn.h. New. W32 wrapper around the dynload mechanism.
+	* dynload.h. New. W32 wrapper around the dynload mechanism.
 	
 2003-07-15  Werner Koch  <wk@gnupg.org>
 
diff --git a/common/dlfcn.h b/common/dlfcn.h
deleted file mode 100644
index c88bf3be9..000000000
--- a/common/dlfcn.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* dlfcn.h - W32 functions for run-time dynamic loading
- *      Copyright (C) 2003 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#ifndef __MINGW32__
-#include <dlfcn.h> /* include the actual header file */
-#else
-#ifndef W32_DLFCN_H
-#define W32_DLFCN_H
-
-#include <windows.h>
-
-static __inline__ void *
-dlopen (const char * name, int flag)
-{
-  void * hd = LoadLibrary (name);
-  return hd;
-}
-
-static __inline__ void *
-dlsym (void *hd, const char *sym)
-{
-  if (hd && sym)
-    {
-      void * fnc = GetProcAddress (hd, sym);
-      if (!fnc)
-        return NULL;
-      return fnc;
-    }
-  return NULL;
-}
-
-
-static __inline__ const char *
-dlerror (void)
-{
-  static char buf[32];
-  sprintf (buf, "ec=%lu", GetLastError ());
-  return buf;
-}
-
-
-static __inline__ int
-dlclose (void * hd)
-{
-  if (hd)
-    {
-      CloseHandle (hd);
-      return 0;
-    }
-  return -1;
-}  
-
-#endif /*W32_DLFCN_H*/
-#endif
diff --git a/common/dynload.h b/common/dynload.h
new file mode 100644
index 000000000..d2df5f017
--- /dev/null
+++ b/common/dynload.h
@@ -0,0 +1,69 @@
+/* dlfcn.h - W32 functions for run-time dynamic loading
+ *      Copyright (C) 2003 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * 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>
+#else
+#include <windows.h>
+
+static __inline__ void *
+dlopen (const char * name, int flag)
+{
+  void * hd = LoadLibrary (name);
+  return hd;
+}
+
+static __inline__ void *
+dlsym (void *hd, const char *sym)
+{
+  if (hd && sym)
+    {
+      void * fnc = GetProcAddress (hd, sym);
+      if (!fnc)
+        return NULL;
+      return fnc;
+    }
+  return NULL;
+}
+
+
+static __inline__ const char *
+dlerror (void)
+{
+  static char buf[32];
+  sprintf (buf, "ec=%lu", GetLastError ());
+  return buf;
+}
+
+
+static __inline__ int
+dlclose (void * hd)
+{
+  if (hd)
+    {
+      CloseHandle (hd);
+      return 0;
+    }
+  return -1;
+}  
+#endif /*__MINGW32__*/
+#endif /*GNUPG_DYNLOAD_H*/
-- 
cgit v1.2.3