stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed ansi checks for off_t definition, and added option to define it if needed.

Browse source
This commit is contained in:
Snaipe 2015-11-15 22:52:25 +01:00
parent dd557f6f68
commit e7faf8aaed
4 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -53,6 +53,10 @@ if (WIN32 AND NOT MSVC)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-no-undefined")
endif()
# Compilation options
option(MINGW_DEFINE_OFF_T "Define off_t and off64_t ourselves before including io.h" OFF)
# Setup coveralls
option(COVERALLS "Turn on coveralls support" OFF)

19
src/compat/internal.h
View file

@ -31,21 +31,18 @@
# define _WIN32_WINNT 0x0502
# include <windows.h>
# if defined(__MINGW32__) || defined(__MINGW64__)
# if defined(MINGW_DEFINE_OFF_T) && (defined(__MINGW32__) || defined(__MINGW64__))
# include "off_t.h"
# if defined(__STRICT_ANSI__) || defined(MINGW_DEFINE_OFF_T)
# include "off_t.h"
# if !defined(__MINGW64__)
# define off_t cr_off32
# else
# define off_t cr_off64
# endif
# define off64_t cr_off64
# if !defined(__MINGW64__)
# define off_t cr_off32
# else
# define off_t cr_off64
# endif
# define off64_t cr_off64
# endif
# include <io.h>
# if defined(__MINGW32__) || defined(__MINGW64__)
# if defined(MINGW_DEFINE_OFF_T) && (defined(__MINGW32__) || defined(__MINGW64__))
# undef off_t
# undef off64_t
# endif

19
src/compat/posix.h
View file

@ -40,22 +40,19 @@
# define _POSIX_SOURCE 1
# define TMP_POSIX
# endif
# if defined(__MINGW32__) || defined(__MINGW64__)
# if defined(MINGW_DEFINE_OFF_T) && (defined(__MINGW32__) || defined(__MINGW64__))
# include "off_t.h"
# if defined(__STRICT_ANSI__) || defined(MINGW_DEFINE_OFF_T)
# include "off_t.h"
# if !defined(__MINGW64__)
# define off_t cr_off32
# else
# define off_t cr_off64
# endif
# define off64_t cr_off64
# if !defined(__MINGW64__)
# define off_t cr_off32
# else
# define off_t cr_off64
# endif
# define off64_t cr_off64
# endif
# include <stdio.h>
# include <string.h>
# if defined(__MINGW32__) || defined(__MINGW64__)
# if defined(MINGW_DEFINE_OFF_T) && defined(__MINGW32__) || defined(__MINGW64__)
# undef off_t
# undef off64_t
# endif

1
src/config.h.in
View file

@ -5,6 +5,7 @@
#cmakedefine HAVE_PCRE @HAVE_PCRE@
#cmakedefine ENABLE_VALGRIND_ERRORS @ENABLE_VALGRIND_ERRORS@
#cmakedefine01 HAVE_STRTOK_S
#cmakedefine01 MINGW_DEFINE_OFF_T
# define LOCALEDIR "${LOCALEDIR}"
# define PACKAGE "${PROJECT_NAME}"