fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Redefine strdup to make Windows happy

Browse source
This commit is contained in:
Sam Ellicott 2020-05-19 23:19:58 -04:00
parent 6fdbe1df89
commit 2b0bb5a78d
5 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
colorchord2/chash.c
View file

@ -10,6 +10,13 @@
#include <stdio.h> #include <stdio.h>
#include <malloc.h> #include <malloc.h>
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) \
|| defined(_WIN32) || defined(_WIN64)
#ifndef strdup
#define strdup _strdup
#endif
#endif
#define I_AM_LITTLE (((union { unsigned x; unsigned char c; }){1}).c) #define I_AM_LITTLE (((union { unsigned x; unsigned char c; }){1}).c)
static unsigned long GetStrHash( const char * c ) static unsigned long GetStrHash( const char * c )
@ -126,7 +133,7 @@ void ** HashTableInsert( struct chash * hash, const char * key, int dontDupKey )
} }
else else
{ {
thisEntry->key = strdup( key ); thisEntry->key = _strdup( key );
} }
thisEntry->hash = thisHash; thisEntry->hash = thisHash;

7
colorchord2/hidapi.c
View file

@ -58,6 +58,13 @@ typedef LONG NTSTATUS;
/*#define HIDAPI_USE_DDK*/ /*#define HIDAPI_USE_DDK*/
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) \
|| defined(_WIN32) || defined(_WIN64)
#ifndef strdup
#define strdup _strdup
#endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

7
colorchord2/main.c
View file

@ -1,9 +1,14 @@
//Copyright 2015 <>< Charles Lohr under the ColorChord License. //Copyright 2015 <>< Charles Lohr under the ColorChord License.
#if defined(WIN32) || defined(USE_WINDOWS) #if defined(WINDOWS) || defined(USE_WINDOWS)\
|| defined(WIN32) || defined(WIN64) \
|| defined(_WIN32) || defined(_WIN64)
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#ifndef strdup
#define strdup _strdup
#endif #endif
#endif
#include <ctype.h> #include <ctype.h>
#include "color.h" #include "color.h"

7
colorchord2/outdrivers.c
View file

@ -7,6 +7,13 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) \
|| defined(_WIN32) || defined(_WIN64)
#ifndef strdup
#define strdup _strdup
#endif
#endif
int force_white = 0; int force_white = 0;
unsigned char OutLEDs[MAX_LEDS*3]; unsigned char OutLEDs[MAX_LEDS*3];
int UsedLEDs; int UsedLEDs;

7
colorchord2/parameters.c
View file

@ -6,6 +6,13 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#if defined(WINDOWS) || defined(WIN32) || defined(WIN64) \
|| defined(_WIN32) || defined(_WIN64)
#ifndef strdup
#define strdup _strdup
#endif
#endif
static struct chash * parameters; static struct chash * parameters;
//XXX TODO: Make this thread safe. //XXX TODO: Make this thread safe.