bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4412)

[magnus.blaudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4412 magnus.blaudd@stripped	2011-05-24
      ndb
       - Don't define ENOTSUP on Windows if it's already defined

    modified:
      storage/ndb/src/common/util/ndbzio.c
=== modified file 'storage/ndb/src/common/util/ndbzio.c'
--- a/storage/ndb/src/common/util/ndbzio.c	2011-04-18 14:15:23 +0000
+++ b/storage/ndb/src/common/util/ndbzio.c	2011-05-24 14:34:41 +0000
@@ -167,9 +167,11 @@ void ndbz_free(voidpf opaque, voidpf add
 }
 
 #ifdef _WIN32
-/* Windows doesn't define ENOTSUP, define it same as Solaris */
+#ifndef ENOTSUP
+/* If Windows doesn't define ENOTSUP, define it same as Solaris */
 #define ENOTSUP 48
 #endif
+#endif
 
 #ifndef HAVE_POSIX_MEMALIGN
 static inline int posix_memalign(void **memptr, size_t alignment, size_t size)


Attachment: [text/bzr-bundle] bzr/[e-mail]