From 5b9ac202970716f8b58060c3d13cb1e7ef2206a0 Mon Sep 17 00:00:00 2001
From: Cosmin Truta <ctruta@gmail.com>
Date: Sun, 16 Nov 2014 19:37:42 -0600
Subject: [PATCH] [libpng16] Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in

scripts/makefile.vcwin32.
Removed the obsolete $ARCH variable from scripts/makefile.darwin.
---
 ANNOUNCE                 | 20 ++++++++++++--------
 CHANGES                  |  4 ++++
 scripts/makefile.darwin  |  7 +++----
 scripts/makefile.vcwin32 |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 78d467f7e..fa919abe3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.15rc02 - November 14, 2014
+Libpng 1.6.15rc03 - November 17, 2014
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -8,20 +8,20 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.6.15rc02.tar.xz (LZMA-compressed, recommended)
-   1.6.15rc02.tar.gz
+   1.6.15rc03.tar.xz (LZMA-compressed, recommended)
+   1.6.15rc03.tar.gz
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp1615r02.7z  (LZMA-compressed, recommended)
-   lp1615r02.zip
+   lp1615r03.7z  (LZMA-compressed, recommended)
+   lp1615r03.zip
 
 Other information:
 
-   1.6.15rc02-README.txt
-   1.6.15rc02-LICENSE.txt
-   libpng-1.6.15rc02-*.asc (armored detached GPG signatures)
+   1.6.15rc03-README.txt
+   1.6.15rc03-LICENSE.txt
+   libpng-1.6.15rc03-*.asc (armored detached GPG signatures)
 
 Changes since the last public release (1.6.14):
 
@@ -84,6 +84,10 @@ Version 1.6.15rc02 [November 14, 2014]
     is different from POSIX make and other make programs.  Surround the
     macro definitions with ifndef guards (Cosmin).
 
+Version 1.6.15rc03 [November 16, 2014]
+  Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32.
+  Removed the obsolete $ARCH variable from scripts/makefile.darwin.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 4ba274dc7..c2a21eee0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5092,6 +5092,10 @@ Version 1.6.15rc02 [November 14, 2014]
     is different from POSIX make and other make programs.  Surround the
     macro definitions with ifndef guards (Cosmin).
 
+Version 1.6.15rc03 [November 16, 2014]
+  Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32.
+  Removed the obsolete $ARCH variable from scripts/makefile.darwin.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index fdc744d92..be3f92c54 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -36,12 +36,11 @@ LN_SF=ln -sf
 RANLIB=ranlib
 CP=cp
 RM_F=/bin/rm -f
-ARCH=-arch ppc -arch i386 -arch x86_64
 
 CPPFLAGS=-I$(ZLIBINC)
 # CFLAGS=-W -Wall -O3 -funroll-loops
-CFLAGS=-W -Wall -O -funroll-loops $(ARCH)
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz $(ARCH)
+CFLAGS=-W -Wall -O -funroll-loops
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -113,7 +112,7 @@ $(LIBSOMAJ): $(OBJSDLL)
 	$(CC) -dynamiclib \
 	 -install_name $(LIBPATH)/$(LIBSOMAJ) \
 	 -current_version 16 -compatibility_version 16 \
-	 $(ARCH) -o $(LIBSOMAJ) \
+	 -o $(LIBSOMAJ) \
 	 $(OBJSDLL) -L$(ZLIBLIB) -lz
 
 pngtest: pngtest.o $(LIBSO)
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 621969239..2bd143cc0 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -16,7 +16,7 @@ CC = cl
 LD = link
 AR = lib
 CPPFLAGS = -I..\zlib
-CFLAGS  = -nologo -D_CRT_SECURE_NO_DEPRECATE -MD -O2 -W3
+CFLAGS  = -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -MD -O2 -W3
 LDFLAGS = -nologo
 ARFLAGS = -nologo
 CP = copy