mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-05-21 02:35:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

common.h: define ZINT_IS_C89 as __STDC_VERSION__ not defined by MSVC

Browse source 
zintconfig.h: edit generator file zintconfig.h.in
This commit is contained in:
gitlost 2022-09-14 14:48:57 +01:00
parent 102c2f3a69
commit d0cfabba84
5 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend/tests/testcommon.c
View file

@ -34,24 +34,22 @@
/* Due to above: */
/* SPDX-License-Identifier: LGPL-2.1+ */
#include "testcommon.h"
#ifdef _WIN32
#include <windows.h>
#include <direct.h>
#endif
#include "../eci.h"
#ifndef NO_PNG
#include <png.h>
#include <zlib.h>
#include <setjmp.h>
#endif
#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <sys/stat.h>
#include "testcommon.h"
#include "../eci.h"
static int tests = 0;
static int failed = 0;
static int skipped = 0;
@ -63,7 +61,7 @@ static const char *testFunc = NULL;
/* Visual C++ 6 doesn't support variadic args to macros, so make do with functions, which have inferior behaviour,
e.g. don't exit on failure, `assert_equal()` type-specific */
#if (defined(_MSC_VER) && _MSC_VER == 1200) || (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199000L) /* VC6 or C89 */
#if (defined(_MSC_VER) && _MSC_VER == 1200) || defined(ZINT_IS_C89) /* VC6 or C89 */
#include <stdarg.h>
void assert_zero(int exp, const char *fmt, ...) {
assertionNum++;

4
backend/tests/testcommon.h
View file

@ -57,7 +57,7 @@ extern "C" {
#define testutil_pclose(stream) _pclose(stream)
#else
#include <unistd.h>
# if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199000L /* C89 */
# if defined(ZINT_IS_C89)
extern FILE *popen(const char *command, const char *type);
extern int pclose(FILE *stream);
# endif
@ -101,7 +101,7 @@ typedef struct s_testFunction {
void testRun(int argc, char *argv[], testFunction funcs[], int funcs_size);
int testContinue(const testCtx *const p_ctx, const int i);
#if (defined(_MSC_VER) &&_MSC_VER == 1200) || (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199000L) /* VC6 or C89 */
#if (defined(_MSC_VER) &&_MSC_VER == 1200) || defined(ZINT_IS_C89) /* VC6 or C89 */
void assert_zero(int exp, const char *fmt, ...);
void assert_nonzero(int exp, const char *fmt, ...);
void assert_null(const void *exp, const char *fmt, ...);