[patch 2/8] WL4081: Make azio build for NDB

Index: ndb-work/storage/ndb/src/common/util/Makefile.am

• ndb-work.orig/storage/ndb/src/common/util/Makefile.am 2007-10-03 17:23:27.419457938 +1000
  +++ ndb-work/storage/ndb/src/common/util/Makefile.am 2007-10-03 17:38:09.066699738 +1000
  @@ -25,7 +25,11 @@ libgeneral_la_SOURCES = \ strdup.c \ ConfigValues.cpp ndb_init.c basestring_vsnprintf.c \ Bitmask.cpp \ - ndb_rand.c
  + ndb_rand.c azio.c
  +
  +INCLUDES_LOC = @ZLIB_INCLUDES@
  +
  +libgeneral_la_LIBADD = @ZLIB_LIBS@
  

 EXTRA_PROGRAMS = testBitmask
 testBitmask_SOURCES = testBitmask.cpp
Index: ndb-work/storage/ndb/include/util/azlib.h

• ndb-work.orig/storage/ndb/include/util/azlib.h 2007-10-03 17:36:20.953397148 +1000
  +++ ndb-work/storage/ndb/include/util/azlib.h 2007-10-04 18:37:45.518892557 +1000
  @@ -35,7 +35,7 @@

 #include <zlib.h>  

-#include "../../mysys/mysys_priv.h"

 #ifdef __cplusplus
@@ -273,7 +273,7 @@ extern unsigned int azread ( azio_stream

      gzread returns the number of uncompressed bytes actually read (0 for     end of file, -1 for error). */  

-extern unsigned int azwrite (azio_stream *s, voidpc buf, unsigned int len);
+extern unsigned int azwrite (azio_stream *s, const void* buf, unsigned int len);
 /*

      Writes the given number of uncompressed bytes into the compressed file.     azwrite returns the number of uncompressed bytes actually written Index: ndb-work/storage/ndb/src/common/util/azio.c

• ndb-work.orig/storage/ndb/src/common/util/azio.c 2007-10-04 17:49:43.021515862 +1000
  +++ ndb-work/storage/ndb/src/common/util/azio.c 2007-10-04 18:37:53.255272000 +1000
  @@ -510,7 +510,7 @@ unsigned int ZEXPORT azread ( azio_strea Writes the given number of uncompressed bytes into the compressed file. azwrite returns the number of bytes actually written (0 in case of error). */ -unsigned int azwrite (azio_stream *s, voidpc buf, unsigned int len)
  +unsigned int azwrite (azio_stream *s, const void* buf, unsigned int len)
  { s->stream.next_in = (Bytef*)buf; s->stream.avail_in = len;

--
Stewart Smith

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com