List:Maria Storage Engine« Previous MessageNext Message »
From:Guilhem Bichot Date:October 16 2008 8:55am
Subject:bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2679)
View as plain text  
#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2679 Guilhem Bichot	2008-10-16
      Fix for Windows build failure: __attribute__ does not exist under Windows
modified:
  storage/maria/ma_static.c

per-file messages:
  storage/maria/ma_static.c
    __attribute__ does not exist under Windows, so it can be used only afer my_global.h which defines it to nothing.
=== modified file 'storage/maria/ma_static.c'
--- a/storage/maria/ma_static.c	2008-10-14 21:23:33 +0000
+++ b/storage/maria/ma_static.c	2008-10-16 08:54:53 +0000
@@ -14,14 +14,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
-static int always_valid(const char *filename __attribute__((unused)))
-{
-  return 0;
-}
-
-int (*maria_test_invalid_symlink)(const char *filename)= always_valid;
-
-
 /*
   Static variables for MARIA library. All definied here for easy making of
   a shared library
@@ -106,3 +98,10 @@ uint32 maria_readnext_vec[]=
   SEARCH_BIGGER, SEARCH_BIGGER, SEARCH_SMALLER, SEARCH_BIGGER, SEARCH_SMALLER,
   SEARCH_BIGGER, SEARCH_SMALLER, SEARCH_SMALLER
 };
+
+static int always_valid(const char *filename __attribute__((unused)))
+{
+  return 0;
+}
+
+int (*maria_test_invalid_symlink)(const char *filename)= always_valid;

Thread
bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2679) Guilhem Bichot16 Oct