diff options
| author | Dave Bodenstab <the.tick@gmx.com> | 2012-02-22 12:04:54 +0000 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2018-09-22 12:47:34 -0700 |
| commit | bc1b4962f048cfa33b76be46493e10cfb256fe98 (patch) | |
| tree | deeb5261798aec4ef7c946916fbfa8b04b82bc5b | |
| parent | e42ca7b484418b169fd19a4c68e23ad2a6ec7a11 (diff) | |
| download | xorg-lib-libXpm-bc1b4962f048cfa33b76be46493e10cfb256fe98.tar.gz | |
Windows build fixes
https://bugs.freedesktop.org/show_bug.cgi?id=46475
https://bugs.freedesktop.org/attachment.cgi?id=57479
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | src/CrBufFrI.c | 4 | ||||
| -rw-r--r-- | src/CrDatFrI.c | 4 | ||||
| -rw-r--r-- | src/WrFFrI.c | 6 | ||||
| -rw-r--r-- | src/XpmI.h | 5 |
4 files changed, 19 insertions, 0 deletions
diff --git a/src/CrBufFrI.c b/src/CrBufFrI.c index 398c645..e2040db 100644 --- a/src/CrBufFrI.c +++ b/src/CrBufFrI.c @@ -39,6 +39,10 @@ #endif #include "XpmI.h" +#ifdef FOR_MSW +#define snprintf _snprintf +#endif + LFUNC(WriteColors, int, (char **dataptr, unsigned int *data_size, unsigned int *used_size, XpmColor *colors, unsigned int ncolors, unsigned int cpp)); diff --git a/src/CrDatFrI.c b/src/CrDatFrI.c index 6735bfc..542662f 100644 --- a/src/CrDatFrI.c +++ b/src/CrDatFrI.c @@ -39,6 +39,10 @@ #endif #include "XpmI.h" +#ifdef FOR_MSW +#define snprintf _snprintf +#endif + LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size, XpmColor *colors, unsigned int ncolors, unsigned int cpp)); diff --git a/src/WrFFrI.c b/src/WrFFrI.c index 067c96b..328c987 100644 --- a/src/WrFFrI.c +++ b/src/WrFFrI.c @@ -51,6 +51,12 @@ #include "fcntl.h" +#ifdef FOR_MSW +#define O_WRONLY _O_WRONLY +#define O_CREAT _O_CREAT +#define O_TRUNC _O_TRUNC +#endif + /* MS Windows define a function called WriteFile @#%#&!!! */ LFUNC(xpmWriteFile, int, (FILE *file, XpmImage *image, const char *name, XpmInfo *info)); @@ -216,8 +216,13 @@ FUNC(xpmHashTableFree, void, (xpmHashTable *table)); FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s)); FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data)); +#if defined(_MSC_VER) && defined(_M_X64) +#define HashAtomData(i) ((void *)(long long)i) +#define HashColorIndex(slot) ((unsigned long long)((*slot)->data)) +#else #define HashAtomData(i) ((void *)(long)i) #define HashColorIndex(slot) ((unsigned long)((*slot)->data)) +#endif #define USE_HASHTABLE (cpp > 2 && ncolors > 4) /* I/O utility */ |