crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/libnfc/master'

Browse source 
Conflicts:
	contrib/windows.h
	libnfc/CMakeLists.txt
	libnfc/log-printf.c
	utils/CMakeLists.txt
This commit is contained in:
Alex Lian 2013-01-31 22:17:33 -05:00
commit caa09db5fc
36 changed files with 301 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contrib/win32/Makefile.am
View file

@ -1,4 +1,6 @@
SUBDIRS = sys .
EXTRA_DIST = \
err.h
err.h \
stdlib.c \
unistd.h

46
contrib/win32/stdlib.c Normal file
View file

@ -0,0 +1,46 @@
/*-
* 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 stdlib.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);
}

8
contrib/win32/unistd.h
View file

@ -1,7 +1,7 @@
/*-
* Public platform independent Near Field Communication (NFC) library
*
* Copyright (C) 2011, 2012 Romuald Conty
* Copyright (C) 2011, 2012, 2013 Romuald Conty
*
* 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
@ -31,5 +31,11 @@
# include <winbase.h>
# define sleep(X) Sleep( X * 1000)
// With MinGW, getopt(3) is provided as separate header
#if defined(WIN32) && defined(__GNUC__) /* mingw compiler */
#include <getopt.h>
#endif
#endif /* _UNISTD_H_ */