Thanks for fixing the build.
The fix looks fine - OK to push.
Olav
Vladislav Vaintroub wrote:
> #At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/
>
> 2684 Vladislav Vaintroub 2008-05-30
> Fix build
> removed:
> vio/CMakeFiles/generate.stamp
> modified:
> storage/falcon/EncodedDataStream.cpp
> storage/falcon/EncodedDataStream.h
> storage/falcon/Engine.h
>
> per-file comments:
> storage/falcon/EncodedDataStream.cpp
> Fix build
> storage/falcon/EncodedDataStream.h
> Fix build
> storage/falcon/Engine.h
> Fix build
> vio/CMakeFiles/generate.stamp
> remove CMake generated file unintentionally put into repository
> === modified file 'storage/falcon/EncodedDataStream.cpp'
> --- a/storage/falcon/EncodedDataStream.cpp 2008-05-14 18:39:57 +0000
> +++ b/storage/falcon/EncodedDataStream.cpp 2008-05-30 15:40:29 +0000
> @@ -89,7 +89,7 @@ EncodedDataStream::EncodedDataStream(Str
> stream = strm;
> }
>
> -EncodedDataStream::EncodedDataStream(const unsigned char *data, uint length)
> +EncodedDataStream::EncodedDataStream(const UCHAR *data, uint length)
> {
> ptr = data;
> end = data + length;
>
> === modified file 'storage/falcon/EncodedDataStream.h'
> --- a/storage/falcon/EncodedDataStream.h 2008-05-30 10:09:31 +0000
> +++ b/storage/falcon/EncodedDataStream.h 2008-05-30 15:40:29 +0000
> @@ -30,8 +30,13 @@ typedef __int64 INT64;
> typedef long long INT64;
> #endif
>
> +#ifndef UCHAR_DEFINED
> +#define UCHAR_DEFINED
> +typedef unsigned char UCHAR;
> +#endif
> +
> #include "BigInt.h"
> -#include "Engine.h"
> +
>
> #define BYTES_POS(n) ((n == 0) ? 0 : \
> (n < (1<<7)) ? 1 : \
> @@ -308,7 +313,7 @@ public:
> virtual void encodeOpaque(int length, const char *string);
> EncodedDataStream();
> EncodedDataStream (Stream *stream);
> - EncodedDataStream(const unsigned char *data, uint length);
> + EncodedDataStream(const UCHAR* data, uint length);
> virtual ~EncodedDataStream();
>
> virtual void encodeDouble (double dbl);
>
> === modified file 'storage/falcon/Engine.h'
> --- a/storage/falcon/Engine.h 2008-04-09 01:36:46 +0000
> +++ b/storage/falcon/Engine.h 2008-05-30 15:40:29 +0000
> @@ -110,7 +110,11 @@ typedef long IPTR;
> typedef unsigned long UIPTR;
> #endif
>
> +#ifndef UCHAR_DEFINED
> +#define UCHAR_DEFINED
> typedef unsigned char UCHAR;
> +#endif
> +
> typedef unsigned long ULONG;
> typedef unsigned short USHORT;
>
>
> === removed file 'vio/CMakeFiles/generate.stamp'
> --- a/vio/CMakeFiles/generate.stamp 2008-05-09 14:10:45 +0000
> +++ b/vio/CMakeFiles/generate.stamp 1970-01-01 00:00:00 +0000
> @@ -1 +0,0 @@
> -# CMake generation timestamp file this directory.
>
>
>
