From aafca1e7263807ba905401ab776e3539a732197e Mon Sep 17 00:00:00 2001 From: Michael Fink Date: Mon, 16 Oct 2017 18:51:14 +0200 Subject: [PATCH] prevent redefining CAMLIBS and IOLIBS define that may already be defined in platform specific config.h file --- gphoto2/gphoto2.h | 3 ++- libgphoto2_port/gphoto2/gphoto2-port-portability.h | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gphoto2/gphoto2.h b/gphoto2/gphoto2.h index bc78f6ab5..ac95a835a 100644 --- a/gphoto2/gphoto2.h +++ b/gphoto2/gphoto2.h @@ -38,9 +38,10 @@ extern "C" { #endif #ifdef WIN32 -#undef CAMLIBS +#ifndef CAMLIBS #define CAMLIBS "." #endif +#endif #include #include diff --git a/libgphoto2_port/gphoto2/gphoto2-port-portability.h b/libgphoto2_port/gphoto2/gphoto2-port-portability.h index 2869e76ae..3d06efb54 100644 --- a/libgphoto2_port/gphoto2/gphoto2-port-portability.h +++ b/libgphoto2_port/gphoto2/gphoto2-port-portability.h @@ -37,10 +37,9 @@ # include # include -# ifdef IOLIBS -# undef IOLIBS +# ifndef IOLIBS +# define IOLIBS "." # endif -# define IOLIBS "." # define strcasecmp _stricmp # ifndef snprintf # define snprintf _snprintf