Alexandre Julliard : configure: Assume that dlfcn.h is available on Unix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2afb4fd044cb7844d7561dd353edd0297b535fc0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2afb4fd044cb7844d7561dd35...

Author: Alexandre Julliard 
Date:   Mon Oct 11 11:25:10 2021 +0200

configure: Assume that dlfcn.h is available on Unix.

Signed-off-by: Alexandre Julliard

---

configure           |  1 -
 configure.ac        |  1 -
 include/config.h.in |  3 ---
 include/wine/port.h | 21 +++++----------------
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/configure b/configure
index 9e369e943f9..afe2653703c 100755
--- a/configure
+++ b/configure
@@ -7476,7 +7476,6 @@ for ac_header in \
    asm/types.h \
    asm/user.h \
    dirent.h \
-	dlfcn.h \
    elf.h \
    float.h \
    gettext-po.h \
diff --git a/configure.ac b/configure.ac
index 7afe8285073..fce0622acd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,7 +447,6 @@ AC_CHECK_HEADERS(\
    asm/types.h \
    asm/user.h \
    dirent.h \
-	dlfcn.h \
    elf.h \
    float.h \
    gettext-po.h \
diff --git a/include/config.h.in b/include/config.h.in
index 51fbd3c9cae..d616fb69a0d 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -59,9 +59,6 @@
    file. */
 #undef HAVE_DISKARBITRATION_DISKARBITRATION_H

-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
 /* Define to 1 if you have the `dlinfo' function. */
 #undef HAVE_DLINFO

diff --git a/include/wine/port.h b/include/wine/port.h
index d162c79d9f5..795a61f741b 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -46,13 +46,10 @@

#if defined(_WIN32) && !defined(__CYGWIN__)

-#include <direct.h>
 #include <errno.h>
-#include <io.h>
-#include <process.h>

-static inline void *dlopen(const char *name, int flags) { return NULL; }
-static inline void *dlsym(void *handle, const char *name) { return NULL; }
+#define dlopen(name,flags)   NULL
+#define dlsym(handle,name)   NULL
 static inline int dlclose(void *handle) { return 0; }
 static inline const char *dlerror(void) { return "No dlopen support on Windows"; }
 static inline int symlink(const char *from, const char *to) { errno = ENOSYS; return -1; }
@@ -67,19 +64,11 @@ static inline int symlink(const char *from, const char *to) { errno = ENOSYS; re
 #endif
 #endif

-#endif  /* _WIN32 */
-
-/****************************************************************
- * Macro definitions
- */
+#else

-#ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
-#else
-#define RTLD_LAZY    0x001
-#define RTLD_NOW     0x002
-#define RTLD_GLOBAL  0x100
-#endif
+
+#endif  /* _WIN32 */

/****************************************************************
  * Constants