mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
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.
This commit is contained in:
@@ -247,13 +247,19 @@ extern int my_snprintf(char* to, size_t n, const char* fmt, ...);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* LEX_STRING */
|
||||
/*
|
||||
LEX_STRING -- a pair of a C-string and its length.
|
||||
|
||||
typedef struct LEX_STRING
|
||||
NOTE: this exactly form of declaration is required for some C-compilers
|
||||
(for one, Sun C 5.7 2005/01/07). Unfortunatelt with such declaration
|
||||
LEX_STRING can not be forward declared.
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char *str;
|
||||
uint length;
|
||||
};
|
||||
} LEX_STRING;
|
||||
|
||||
#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))
|
||||
#define C_STRING_WITH_SIZE(X) ((char *) (X)), ((uint) (sizeof(X) - 1))
|
||||
|
Reference in New Issue
Block a user