diff --git a/ANNOUNCE b/ANNOUNCE index 5ef85666a..377dc7466 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -44,6 +44,8 @@ Version 1.5.20rc02 [November 14, 2014] similarly-named macros are already defined in makefiles. This behavior is different from POSIX make and other make programs. Surround the macro definitions with ifndef guards (Cosmin). + Use memcpy instead of CopyMemory in the definition of png_memcpy. + The Borland C++ build breaks otherwise (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 65dca356f..3a0a624e6 100644 --- a/CHANGES +++ b/CHANGES @@ -4259,10 +4259,12 @@ Version 1.5.20beta02 [November 10, 2014] Version 1.5.20rc01 [November 13, 2014] Version 1.5.20rc02 [November 14, 2014] - The macros passed in the command line to Borland make are ignored if - similarly-named macros are already defined in makefiles. This behavior + The macros passed in the command line to Borland make were ignored if + similarly-named macros were already defined in makefiles. This behavior is different from POSIX make and other make programs. Surround the macro definitions with ifndef guards (Cosmin). + Use memcpy instead of CopyMemory in the definition of png_memcpy. + The Borland C++ build breaks otherwise (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngpriv.h b/pngpriv.h index a74c12bf0..5a41e94b2 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -418,7 +418,7 @@ # define CVT_PTR_NOCHECK(ptr) (ptr) # define png_strlen lstrlenA # define png_memcmp memcmp -# define png_memcpy CopyMemory +# define png_memcpy memcpy # define png_memset memset # else # define CVT_PTR(ptr) (ptr)