summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Cook <tony@develop-help.com>2012-03-14 00:50:47 +1100
committerTony Cook <tony@develop-help.com>2012-03-14 00:50:47 +1100
commite7261e4741fb705fd81691ad75d3d6a6e7676dd8 (patch)
tree5718ad1a3fe5c2982666b57fb8dae3237ce2ec00
parent52beaae7e855a9b9a072ca4d74a4fe12101aa915 (diff)
downloadperl-tonyc/fix-raw-zlib.tar.gz
partially revert changes to zutil.htonyc/fix-raw-zlib
These were preventing the declaration and use of the STDC memcpy() with Z_SOLO. Z_SOLO preventing use of memcpy() is like preventing use of structure assignment.
-rw-r--r--cpan/Compress-Raw-Zlib/zlib-src/zutil.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpan/Compress-Raw-Zlib/zlib-src/zutil.h b/cpan/Compress-Raw-Zlib/zlib-src/zutil.h
index dff1112feb..426d98e3d0 100644
--- a/cpan/Compress-Raw-Zlib/zlib-src/zutil.h
+++ b/cpan/Compress-Raw-Zlib/zlib-src/zutil.h
@@ -21,7 +21,7 @@
#include "zlib.h"
-#if defined(STDC) && !defined(Z_SOLO)
+#if defined(STDC)
# if !(defined(_WIN32_WCE) && defined(_MSC_VER))
# include <stddef.h>
# endif
@@ -185,7 +185,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
/* functions */
-#if defined(pyr) || defined(Z_SOLO)
+#if defined(pyr)
# define NO_MEMCPY
#endif
#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)