Merge pull request #207 from vividos/msvc14-port-2_5_16

prevent redefining CAMLIBS and IOLIBS on WIN32
This commit is contained in:
Marcus Meissner
2018-02-11 22:25:33 +01:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -38,9 +38,10 @@ extern "C" {
#endif
#ifdef WIN32
#undef CAMLIBS
#ifndef CAMLIBS
#define CAMLIBS "."
#endif
#endif
#include <gphoto2/gphoto2-port.h>
#include <gphoto2/gphoto2-port-log.h>

View File

@@ -37,10 +37,9 @@
# include <stdio.h>
# include <direct.h>
# ifdef IOLIBS
# undef IOLIBS
# ifndef IOLIBS
# define IOLIBS "."
# endif
# define IOLIBS "."
# define strcasecmp _stricmp
# ifndef snprintf
# define snprintf _snprintf