From 450343788f60e231e5477f066bf6323f9ae0661d Mon Sep 17 00:00:00 2001 From: anders_k Date: Fri, 14 Apr 2017 21:48:55 +0000 Subject: [PATCH] Fixed two GCC POSIX warnings git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6849 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Library/LibraryLocal/LibraryLocal.cpp | 4 ++-- Source/zlib/ZUTIL.H | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Contrib/Library/LibraryLocal/LibraryLocal.cpp b/Contrib/Library/LibraryLocal/LibraryLocal.cpp index 5b4cb7ea..1151a15a 100644 --- a/Contrib/Library/LibraryLocal/LibraryLocal.cpp +++ b/Contrib/Library/LibraryLocal/LibraryLocal.cpp @@ -150,8 +150,8 @@ int _tmain(int argc, TCHAR* argv[]) } else { - fprintf(fHdr, "!define LIBRARY_VERSION_HIGH %lu\n", high); - fprintf(fHdr, "!define LIBRARY_VERSION_LOW %lu\n", low); + fprintf(fHdr, "!define LIBRARY_VERSION_HIGH %lu\n", static_cast(high)); + fprintf(fHdr, "!define LIBRARY_VERSION_LOW %lu\n", static_cast(low)); } fclose(fHdr); diff --git a/Source/zlib/ZUTIL.H b/Source/zlib/ZUTIL.H index e27b0ea5..264fe27a 100644 --- a/Source/zlib/ZUTIL.H +++ b/Source/zlib/ZUTIL.H @@ -69,6 +69,7 @@ typedef unsigned long ulg; # include "../exehead/util.h" # define zmemcpy mini_memcpy # else +# include // Avoid "incompatible implicit declaration of built-in function" # define zmemcpy memcpy # endif #else