c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another fix for modified zconf.h on Gentoo.

Browse Source 
Issue #116
This commit is contained in:
John McNamara 2021-04-16 21:32:39 +01:00
parent df4f2aa854
commit b9a98af00d
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -206,11 +206,6 @@ endif()
# ------- # -------
list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS NOCRYPT NOUNCRYPT) list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS NOCRYPT NOUNCRYPT)
# Fix for modified zconf.h on Gentoo.
if(${CMAKE_HOST_SYSTEM} MATCHES gentoo)
list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS OF=_Z_OF)
endif()
# Ensure CRT Secure warnings are disabled # Ensure CRT Secure warnings are disabled
if(MSVC) if(MSVC)
list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS) list(APPEND LXW_PRIVATE_COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)

6
include/xlsxwriter/third_party/ioapi.h vendored
View File

@ -56,7 +56,7 @@
#define ftello64 ftell #define ftello64 ftell
#define fseeko64 fseek #define fseeko64 fseek
#else #else
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__OpenBSD__)
#define fopen64 fopen #define fopen64 fopen
#define ftello64 ftello #define ftello64 ftello
#define fseeko64 fseeko #define fseeko64 fseeko
@ -137,6 +137,10 @@ extern "C" {
/* Workaround for modified zconf.h on Gentoo system. */
#if defined(_Z_OF)
#define OF _Z_OF
#endif
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));

6
src/Makefile
View File

@ -69,12 +69,6 @@ endif
# Flags passed to compiler. # Flags passed to compiler.
CFLAGS += -g $(OPT_LEVEL) -Wall -Wextra -Wstrict-prototypes -pedantic -ansi CFLAGS += -g $(OPT_LEVEL) -Wall -Wextra -Wstrict-prototypes -pedantic -ansi
# Fix for modified zconf.h on Gentoo.
ifneq (,$(findstring gentoo, $(shell uname -sr)))
CFLAGS += -DOF=_Z_OF
endif
# Ignore icc remarks about inlining limits. # Ignore icc remarks about inlining limits.
ifeq ($(CC),icc) ifeq ($(CC),icc)
CFLAGS +=-diag-disable=11074,11076 CFLAGS +=-diag-disable=11074,11076

5
third_party/minizip/Makefile vendored
View File

@ -32,11 +32,6 @@ CC = gcc
CFLAGS += -DUSE_FILE32API CFLAGS += -DUSE_FILE32API
endif endif
# Fix for modified zconf.h on Gentoo.
ifneq (,$(findstring gentoo, $(UNAME)))
CFLAGS += -DOF=_Z_OF
endif
all: ioapi.o zip.o ioapi.so zip.so all: ioapi.o zip.o ioapi.so zip.so
%.o : %.c %.o : %.c

10
third_party/minizip/ioapi.h vendored
View File

@ -18,6 +18,12 @@
*/ */
/* Pragma added by libxlsxwriter to avoid warnings with -pedantic -ansi. */
#ifndef _WIN32
#pragma GCC system_header
#endif
#ifndef _ZLIBIOAPI64_H #ifndef _ZLIBIOAPI64_H
#define _ZLIBIOAPI64_H #define _ZLIBIOAPI64_H
@ -131,6 +137,10 @@ extern "C" {
/* Workaround for modified zconf.h on Gentoo system. */
#if defined(_Z_OF)
#define OF _Z_OF
#endif
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));

10
third_party/minizip/zip.h vendored
View File

@ -37,7 +37,7 @@
*/ */
/* Pragma added by libxlsxwriter project to avoid warnings with -pedantic -ansi. */ /* Pragma added by libxlsxwriter to avoid warnings with -pedantic -ansi. */
#ifndef _WIN32 #ifndef _WIN32
#pragma GCC system_header #pragma GCC system_header
#endif #endif
@ -59,6 +59,14 @@ extern "C" {
#include "ioapi.h" #include "ioapi.h"
#endif #endif
/* Encryption not required by libxlsxwriter. */
#ifndef NOCRYPT
#define NOCRYPT
#endif
#ifndef NOUNCRYPT
#define NOUNCRYPT
#endif
#ifdef HAVE_BZIP2 #ifdef HAVE_BZIP2
#include "bzlib.h" #include "bzlib.h"
#endif #endif