Fix setenv/unsetenv link errors by implementing a local version using Windows SetEnvironmentVariable.
Untested, and does not comply with the error returns per setenv.
This commit is contained in:
parent
9f682cc52b
commit
ef33827f04
3 changed files with 64 additions and 1 deletions
48
contrib/win32/nfc_win32.c
Normal file
48
contrib/win32/nfc_win32.c
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
/*-
|
||||||
|
* Public platform independent Near Field Communication (NFC) library
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013 Alex Lian
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU Lesser General Public License as published by the
|
||||||
|
* Free Software Foundation, either version 3 of the License, or (at your
|
||||||
|
* option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file nfc_win32.c
|
||||||
|
* @brief Windows System compatibility
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Handle platform specific includes
|
||||||
|
#include "contrib/windows.h"
|
||||||
|
|
||||||
|
int setenv(const char *name, const char *value, int overwrite)
|
||||||
|
{
|
||||||
|
int exists = GetEnvironmentVariableA(name, NULL, 0);
|
||||||
|
if ((exists && overwrite) || (!exists))
|
||||||
|
{
|
||||||
|
if (!SetEnvironmentVariableA(name, value))
|
||||||
|
{
|
||||||
|
// Set errno here correctly
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
// Exists and overwrite is 0.
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void unsetenv(const char *name)
|
||||||
|
{
|
||||||
|
SetEnvironmentVariableA(name, NULL);
|
||||||
|
}
|
|
@ -45,4 +45,11 @@
|
||||||
# define strdup _strdup
|
# define strdup _strdup
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* setenv and unsetenv are not Windows compliant nor implemented in MinGW.
|
||||||
|
* These declarations get rid of the "implicit declaration warning."
|
||||||
|
*/
|
||||||
|
int setenv(const char *name, const char *value, int overwrite);
|
||||||
|
void unsetenv(const char *name);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,3 +1,11 @@
|
||||||
|
# Windows MinGW workarounds
|
||||||
|
IF(WIN32)
|
||||||
|
message("Adding in contrib win32 sources")
|
||||||
|
SET(WINDOWS_SOURCES ../contrib/win32/nfc_win32)
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32)
|
||||||
|
message("Win32: " ${WINDOWS_SOURCES})
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
# Library's chips
|
# Library's chips
|
||||||
SET(CHIPS_SOURCES chips/pn53x)
|
SET(CHIPS_SOURCES chips/pn53x)
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/chips)
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/chips)
|
||||||
|
@ -29,7 +37,7 @@ IF(LIBUSB_FOUND)
|
||||||
ENDIF(LIBUSB_FOUND)
|
ENDIF(LIBUSB_FOUND)
|
||||||
|
|
||||||
# Library
|
# Library
|
||||||
SET(LIBRARY_SOURCES nfc nfc-device nfc-emulation nfc-internal conf iso14443-subr mirror-subr target-subr ${DRIVERS_SOURCES} ${BUSES_SOURCES} ${CHIPS_SOURCES})
|
SET(LIBRARY_SOURCES nfc nfc-device nfc-emulation nfc-internal conf iso14443-subr mirror-subr target-subr log ${DRIVERS_SOURCES} ${BUSES_SOURCES} ${CHIPS_SOURCES} ${WINDOWS_SOURCES})
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
IF(LIBNFC_DEBUG_OUTPUT)
|
IF(LIBNFC_DEBUG_OUTPUT)
|
||||||
LIST(APPEND LIBRARY_SOURCES log-printf)
|
LIST(APPEND LIBRARY_SOURCES log-printf)
|
||||||
|
|
Loading…
Reference in a new issue