diff options
| author | unknown <anozdrin@mysql.com> | 2006-05-19 04:51:23 +0400 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-05-19 04:51:23 +0400 |
| commit | ac3806046b9b992b796056f398727cfcecd0f69f (patch) | |
| tree | 49302be6f94e4a3379379208fb3bf03436b16df6 /server-tools/instance-manager/instance_map.h | |
| parent | 401d3a0708698c0d33a82e3d0df63471e4482fd0 (diff) | |
| download | mariadb-git-ac3806046b9b992b796056f398727cfcecd0f69f.tar.gz | |
Fix compilation problems on Windows and SUN Solaris.
include/m_string.h:
Fix declaration of C-structure for Visual Studio and Sun C-compiler.
server-tools/instance-manager/IMService.cpp:
Fixed.
server-tools/instance-manager/Makefile.am:
Removed gcc-specific flags.
server-tools/instance-manager/commands.cc:
Moved m_string.h to the header.
server-tools/instance-manager/commands.h:
Replaced forward declaration of LEX_STRING because
it is not understood by all compilers.
server-tools/instance-manager/instance_map.cc:
1. Moved m_string.h to the header.
2. Use (const char *) to point to const C-string.
server-tools/instance-manager/instance_map.h:
Replaced forward declaration of LEX_STRING because
it is not understood by all compilers.
server-tools/instance-manager/instance_options.h:
Fixed headers.
server-tools/instance-manager/mysqlmanager.cc:
Fixed headers.
server-tools/instance-manager/user_management_commands.cc:
Removed unused variables.
server-tools/instance-manager/user_map.cc:
Fixed headers.
Diffstat (limited to 'server-tools/instance-manager/instance_map.h')
| -rw-r--r-- | server-tools/instance-manager/instance_map.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server-tools/instance-manager/instance_map.h b/server-tools/instance-manager/instance_map.h index 04e617aebe4..8e6d2360652 100644 --- a/server-tools/instance-manager/instance_map.h +++ b/server-tools/instance-manager/instance_map.h @@ -18,14 +18,13 @@ #include <my_global.h> #include <my_sys.h> +#include <m_string.h> #include <hash.h> #if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE) #pragma interface #endif -struct LEX_STRING; - class Guardian_thread; class Instance; class Named_value_arr; |