diff options
| -rw-r--r-- | camlibs/lumix/lumix.c | 11 | ||||
| -rw-r--r-- | camlibs/st2205/Makefile-files | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libgphoto2/gphoto2-setting.c | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/camlibs/lumix/lumix.c b/camlibs/lumix/lumix.c index d72da46f1..c8177d91a 100644 --- a/camlibs/lumix/lumix.c +++ b/camlibs/lumix/lumix.c @@ -36,10 +36,15 @@ #include <libxml/xmlreader.h> -#include <sys/socket.h> +#ifdef WIN32 +# include <winsock2.h> +# include <ws2tcpip.h> +#else +# include <sys/socket.h> +# include <netinet/in.h> +# include <arpa/inet.h> +#endif #include <stdlib.h> -#include <netinet/in.h> -#include <arpa/inet.h> #include <gphoto2/gphoto2-library.h> diff --git a/camlibs/st2205/Makefile-files b/camlibs/st2205/Makefile-files index 93a1efbd2..fb0ab8c3a 100644 --- a/camlibs/st2205/Makefile-files +++ b/camlibs/st2205/Makefile-files @@ -10,3 +10,7 @@ st2205_la_LDFLAGS = $(camlib_ldflags) st2205_la_DEPENDENCIES = $(camlib_dependencies) st2205_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ $(LTLIBICONV) st2205_la_CFLAGS = @LIBGD_CFLAGS@ + +if HAVE_MMAN_LIB +st2205_la_LIBADD += -lmman +endif diff --git a/configure.ac b/configure.ac index 74bd34a85..0df0b7a31 100644 --- a/configure.ac +++ b/configure.ac @@ -329,6 +329,9 @@ AC_HEADER_DIRENT AC_HEADER_STDC # after _HEADER_STDC AC_CHECK_HEADERS([sys/param.h sys/mman.h sys/select.h locale.h memory.h getopt.h unistd.h mcheck.h limits.h sys/time.h langinfo.h]) +AC_CHECK_LIB(mman, mmap, [ + AM_CONDITIONAL([HAVE_MMAN_LIB], [test x$ac_cv_lib_mman_mmap = xyes]) + ]) AC_C_INLINE([]) AC_C_CONST([]) dnl FIXME: AC_STRUCT_TIMEZONE diff --git a/libgphoto2/gphoto2-setting.c b/libgphoto2/gphoto2-setting.c index cfe2438be..0a5b770b6 100644 --- a/libgphoto2/gphoto2-setting.c +++ b/libgphoto2/gphoto2-setting.c @@ -37,7 +37,7 @@ #ifdef WIN32 /* Win32 headers may use interface as a define; temporarily correct this */ #define interface struct -#include <Shlobj.h> +#include <shlobj.h> #undef interface #endif |