github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 04:49:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issues with commit 4197a3f on some linux distributions and old mingw environments (issue #217)

Browse source
This commit is contained in:
pwpiwi 2017-02-24 16:19:35 +01:00
commit 5a6a7affc5
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/whereami.c
View file

@ -51,7 +51,7 @@ extern "C" {
#pragma warning(push, 3) #pragma warning(push, 3)
#endif #endif
#include <windows.h> #include <windows.h>
#include <intrin.h> //#include <intrin.h> // not required and doesn't exist in old mingw environments
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#endif #endif
@ -136,7 +136,9 @@ int WAI_PREFIX(getExecutablePath)(char* out, int capacity, int* dirname_length)
return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length); return WAI_PREFIX(getModulePath_)(NULL, out, capacity, dirname_length);
} }
WAI_NOINLINE // GetModuleHandleEx() is not available on old mingw environments. We don't need getModulePath() yet.
// Sacrifice it for the time being to improve backwards compatibility
/* WAI_NOINLINE
WAI_FUNCSPEC WAI_FUNCSPEC
int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length) int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
{ {
@ -157,13 +159,15 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
return length; return length;
} }
*/
#elif defined(__linux__) #elif defined(__linux__)
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits.h> // #include <limits.h> // not all linux distributions define PATH_MAX in limits.h because it depends on the filesystem. Therefore use...
#include <linux/limits.h>
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif #endif