[Pcsclite-cvs-commit] PCSC/src dyn_unix.c,1.6,1.7
aet-guest@quantz.debian.org
aet-guest@quantz.debian.org
Mon, 08 Sep 2003 14:25:52 +0200
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv20180
Modified Files:
dyn_unix.c
Log Message:
HP-UX build fix, add sanity checks to not to use dlfcn
if there's native dynamic loading interface available,
like HP-UX and MacOS X does.
The other option would be just to merge all dynamic
loading routines into one file, a lot simpler solution.
Index: dyn_unix.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/dyn_unix.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dyn_unix.c 7 Sep 2003 20:28:53 -0000 1.6
+++ dyn_unix.c 8 Sep 2003 12:25:49 -0000 1.7
@@ -15,7 +15,7 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
-#ifdef HAVE_DLFCN_H
+#if defined(HAVE_DLFCN_H) && !defined(HAVE_DL_H) && !defined(__APPLE__)
#include <dlfcn.h>
#include <stdlib.h>
@@ -84,4 +84,4 @@
return rv;
}
-#endif /* HAVE_DLFCN_H */
+#endif /* HAVE_DLFCN_H && !HAVE_DL_H && !__APPLE__ */