From 4ff40f1be89af3cc8b0d051109660d9d62d52126 Mon Sep 17 00:00:00 2001 From: Carlos Fernandez Date: Fri, 26 Oct 2018 14:07:59 -0700 Subject: [PATCH] Fix compilation of utf8proc on Windows --- src/lib_ccx/ccx_encoders_curl.c | 2 -- src/lib_ccx/params.c | 4 +--- src/utf8proc/utf8proc.h | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib_ccx/ccx_encoders_curl.c b/src/lib_ccx/ccx_encoders_curl.c index 505e9980..cb85e82d 100644 --- a/src/lib_ccx/ccx_encoders_curl.c +++ b/src/lib_ccx/ccx_encoders_curl.c @@ -8,8 +8,6 @@ #include "ccx_decoders_708_output.h" #include "ccx_encoders_xds.h" #include "ccx_encoders_helpers.h" -#define UTF8PROC_STATIC -#define UTF8PROC_DLLEXPORT #include "utf8proc.h" extern CURL *curl; diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c index e63f1874..ddba0f8a 100644 --- a/src/lib_ccx/params.c +++ b/src/lib_ccx/params.c @@ -1,8 +1,5 @@ #include "png.h" #include "protobuf-c.h" -#define UTF8PROC_STATIC -#define UTF8PROC_DLLEXPORT -#include "utf8proc/utf8proc.h" #include "zlib.h" #include "gpac/version.h" #include "lib_ccx.h" @@ -16,6 +13,7 @@ #include "../lib_hash/sha2.h" #include #include +#include "utf8proc/utf8proc.h" #ifdef ENABLE_OCR #include "capi.h" diff --git a/src/utf8proc/utf8proc.h b/src/utf8proc/utf8proc.h index f5cc1e1e..a00f993d 100755 --- a/src/utf8proc/utf8proc.h +++ b/src/utf8proc/utf8proc.h @@ -120,6 +120,8 @@ typedef bool utf8proc_bool; #endif #include +#define UTF8PROC_STATIC + #ifdef UTF8PROC_STATIC # define UTF8PROC_DLLEXPORT #else