diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-02 10:34:51 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-02 10:34:51 +0200 |
commit | e8ea671c2523f56fce0eacabbba05689aa4824f9 (patch) | |
tree | af7b056f4ecff525dd8b0fbaa978635269be0d2a /storage/connect/tabpivot.cpp | |
parent | 893631a8c188817e3294edc11de2087630dde801 (diff) | |
download | mariadb-git-e8ea671c2523f56fce0eacabbba05689aa4824f9.tar.gz |
Commit changes pulled from ob-10.0
Diffstat (limited to 'storage/connect/tabpivot.cpp')
-rw-r--r-- | storage/connect/tabpivot.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabpivot.cpp b/storage/connect/tabpivot.cpp index b36dcbf94af..b628e26d3c7 100644 --- a/storage/connect/tabpivot.cpp +++ b/storage/connect/tabpivot.cpp @@ -17,7 +17,7 @@ /***********************************************************************/ #include "my_global.h" #include "table.h" // MySQL table definitions -#if defined(WIN32) +#if defined(__WIN__) #if defined(__BORLANDC__) #define __MFC_COMPAT__ // To define min/max as macro #endif |