use _NSIS_ZLIB_H instead of _ZLIB_H (which causes trouble on Solaris).

git-svn: trunk@3059
18 years ago · 602e35c833
parent cd6d37c102
commit 602e35c833
2 changed files with 8 additions and 2 deletions
--- a/6
+++ b/6
@ -1,7 +1,13 @@
+Mon May 21 20:48:00 EEST 2007 (edwin)
+----------------------------------
+  * libclamav/nsis/nsis_zlib.h: use _NSIS_ZLIB_H instead of _ZLIB_H
+
 Mon May 21 12:58:51 CEST 2007 (acab)
+----------------------------------
  * libclamav/nsis: more NSIS typos (reported by Gianluigi Tiesi)

 Mon May 21 12:51:17 CEST 2007 (acab)
+----------------------------------
  * libclamav/nsis: NSIS related typos (thx njh)

 Mon May 21 11:33:07 CEST 2007 (tk)
--- a/libclamav/nsis/nsis_zlib.h
+++ b/libclamav/nsis/nsis_zlib.h
@ -25,8 +25,8 @@

 */

-#ifndef _ZLIB_H
-#define _ZLIB_H
+#ifndef _NSIS_ZLIB_H
+#define _NSIS_ZLIB_H

 #include "nsis_zconf.h"
 #include "nsis_zutil.h"