CTS-320 (part 2 of 3) use system zlib for standalone

2010-10-25 11:38:33 +02:00 · 2010-10-25 11:38:33 +02:00 · 03acf85c36
parent 807d835c2b e3d61c9236
commit 03acf85c36
2 changed files with 7 additions and 1 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -142,6 +142,7 @@ Blakar Ogre
 blino Nakamura
 	VWR-17
 Boroondas Gupte
+	CTS-320
 	SNOW-278
 	VWR-233
 	WEB-262
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@ -39,7 +39,12 @@

 #include <iostream>
 #include "apr_base64.h"
-#include "zlib/zlib.h"  // for davep's dirty little zip functions
+
+#ifdef LL_STANDALONE
+# include <zlib.h>
+#else
+# include "zlib/zlib.h"  // for davep's dirty little zip functions
+#endif

 #if !LL_WINDOWS
 #include <netinet/in.h> // htonl & ntohl