summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua MacDonald <josh.macdonald@gmail.com>2016-05-06 23:37:42 -0700
committerJoshua MacDonald <josh.macdonald@gmail.com>2016-05-06 23:37:42 -0700
commit61b9211a41f009abc1312cffc926feb42cb0c746 (patch)
tree459dc5f677099186bfb4b25e44df19af1b0b2d20
parentc05f1ee5e52cfa8e37e21b381e42681e5edef330 (diff)
Remove -pedantic elimiantes mingw32 warnings
-rw-r--r--xdelta3/Makefile.am4
-rw-r--r--xdelta3/xdelta3.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index d89584d..2d9f6db 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -73,8 +73,8 @@ WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
73 # -Wno-variadic-macros \ 73 # -Wno-variadic-macros \
74 # -Wno-c++98-compat-pedantic 74 # -Wno-c++98-compat-pedantic
75 75
76C_WFLAGS = $(WFLAGS) -pedantic -std=c99 76C_WFLAGS = $(WFLAGS) -std=c99
77CXX_WFLAGS = $(WFLAGS) -pedantic -std=c++11 77CXX_WFLAGS = $(WFLAGS) -std=c++11
78 78
79common_CFLAGS = \ 79common_CFLAGS = \
80 -DREGRESSION_TEST=1 \ 80 -DREGRESSION_TEST=1 \
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 4c5f4b8..b513efb 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -166,8 +166,6 @@ typedef ULONGLONG uint64_t;
166/* Set a xoff_t typedef and the "Q" printf insert. */ 166/* Set a xoff_t typedef and the "Q" printf insert. */
167#if defined(_WIN32) 167#if defined(_WIN32)
168typedef uint64_t xoff_t; 168typedef uint64_t xoff_t;
169/* Note: The following generates benign warnings in a mingw
170 * cross-compiler */
171#define Q "I64" 169#define Q "I64"
172#elif SIZEOF_UNSIGNED_LONG == 8 170#elif SIZEOF_UNSIGNED_LONG == 8
173typedef unsigned long xoff_t; 171typedef unsigned long xoff_t;
@@ -202,8 +200,6 @@ typedef uint32_t xoff_t;
202/* Set a usize_ttypedef and the "W" printf insert. */ 200/* Set a usize_ttypedef and the "W" printf insert. */
203#if defined(_WIN32) 201#if defined(_WIN32)
204typedef uint64_t usize_t; 202typedef uint64_t usize_t;
205/* Note: The following generates benign warnings in a mingw
206 * cross-compiler */
207#define W "I64" 203#define W "I64"
208#elif SIZEOF_UNSIGNED_LONG == 8 204#elif SIZEOF_UNSIGNED_LONG == 8
209typedef unsigned long usize_t; 205typedef unsigned long usize_t;