diff options
| author | willson-chen <53104026+willson-chen@users.noreply.github.com> | 2019-10-28 15:14:47 +0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gmail.com> | 2019-10-28 01:14:47 -0600 |
| commit | 2874546a44e5067fa1041b4b9dc870436fe6ee61 (patch) | |
| tree | 027947d928e716cde4556fb9dc52347e9956fc8e /tests/gdtest | |
| parent | eec2c484434a4b6761b1661a8468fa24b15ce13e (diff) | |
| download | libgd-2874546a44e5067fa1041b4b9dc870436fe6ee61.tar.gz | |
update gdtest.c to support msys (#528)
* config.h is never generated in msys with existing windows/msys/Makefile
* errno.h is to solve EEXIST is not defined error
* GDTEST_TOP_DIR is defined in other compile ways except msys and test_config.h is created by windows/msys/run_test.sh
* Ui64 is only created by microsoft by not support in windows and ULL is common used and general supported
* _int64 is only support by vc but __int64 can be support in win
Diffstat (limited to 'tests/gdtest')
| -rw-r--r-- | tests/gdtest/gdtest.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tests/gdtest/gdtest.c b/tests/gdtest/gdtest.c index 9a9f2a5..832f27a 100644 --- a/tests/gdtest/gdtest.c +++ b/tests/gdtest/gdtest.c @@ -1,4 +1,6 @@ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif #include <assert.h> #include <setjmp.h> #include <stdlib.h> @@ -21,7 +23,14 @@ #endif #ifdef _WIN32 -# include "readdir.h" +#include "readdir.h" +#include <errno.h> +#endif + +/* GDTEST_TOP_DIR is defined in other compile ways except msys + * test_config.h is created by windows/msys/run_test.sh*/ +#ifndef GDTEST_TOP_DIR +#include <test_config.h> #endif #include "gd.h" @@ -186,11 +195,11 @@ static int getfilesystemtime(struct timeval *tv) fft.LowPart = ft.dwLowDateTime; ff = fft.QuadPart; - ff /= 10Ui64; /* convert to microseconds */ - ff -= 11644473600000000Ui64; /* convert to unix epoch */ + ff /= 10ULL; /* convert to microseconds */ + ff -= 11644473600000000ULL; /* convert to unix epoch */ - tv->tv_sec = (long)(ff / 1000000Ui64); - tv->tv_usec = (long)(ff % 1000000Ui64); + tv->tv_sec = (long)(ff / 1000000ULL); + tv->tv_usec = (long)(ff % 1000000ULL); return 0; } @@ -203,7 +212,7 @@ mkdtemp (char *tmpl) static int counter = 0; char *XXXXXX; struct timeval tv; - _int64 value; + __int64 value; int count; /* find the last occurrence of "XXXXXX" */ @@ -219,7 +228,7 @@ mkdtemp (char *tmpl) value = (tv.tv_usec ^ tv.tv_sec) + counter++; for (count = 0; count < 100; value += 7777, ++count) { - _int64 v = value; + __int64 v = value; /* Fill in the random bits. */ XXXXXX[0] = letters[v % NLETTERS]; |