1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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:
unknown
2006-05-19 04:51:23 +04:00
parent 401d3a0708
commit ac3806046b
11 changed files with 19 additions and 19 deletions

View File

@ -30,15 +30,14 @@ void IMService::Run(DWORD argc, LPTSTR *argv)
// report to the SCM that we're about to start
ReportStatus((DWORD)SERVICE_START_PENDING);
Options o;
o.load(argc, argv);
Options::load(argc, argv);
// init goes here
ReportStatus((DWORD)SERVICE_RUNNING);
// wait for main loop to terminate
manager(o);
o.cleanup();
manager();
Options::cleanup();
}
void IMService::Log(const char *msg)

View File

@ -93,9 +93,6 @@ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \
EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
IMService.h cmakelists.txt
AM_CFLAGS = -Werror
AM_CXXFLAGS = -Werror
tags:
ctags -R *.h *.cc

View File

@ -21,7 +21,6 @@
#include "commands.h"
#include <my_global.h>
#include <m_string.h>
#include <m_ctype.h>
#include <mysql.h>
#include <my_dir.h>

View File

@ -18,6 +18,7 @@
#include <my_global.h>
#include <my_sys.h>
#include <m_string.h>
#include <hash.h>
#include "command.h"
@ -28,7 +29,6 @@
#pragma interface
#endif
struct LEX_STRING;
/*
Print all instances of this instance manager.

View File

@ -23,7 +23,6 @@
#include <my_global.h>
#include <m_ctype.h>
#include <mysql_com.h>
#include <m_string.h>
#include "buffer.h"
#include "guardian.h"
@ -117,7 +116,7 @@ static void parse_option(const char *option_str,
char *option_name_buf,
char *option_value_buf)
{
char *eq_pos;
const char *eq_pos;
const char *ptr= option_str;
while (*ptr == '-')

View File

@ -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;

View File

@ -20,6 +20,7 @@
#include <my_sys.h>
#include "parse.h"
#include "portability.h" /* for pid_t on Win32 */
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface

View File

@ -34,7 +34,8 @@
#include "user_management_commands.h"
#ifdef __WIN__
#include "windowsservice.h"
#include "IMService.h"
#include "WindowsService.h"
#endif

View File

@ -216,7 +216,6 @@ int Add_user_cmd::execute()
{
LEX_STRING user_name;
const char *password;
char scrambled_password_buf[SCRAMBLED_PASSWORD_CHAR_LENGTH + 1];
User_map user_map;
User *new_user;
@ -310,7 +309,6 @@ int Edit_user_cmd::execute()
{
LEX_STRING user_name;
const char *password;
char scrambled_password_buf[SCRAMBLED_PASSWORD_CHAR_LENGTH + 1];
User_map user_map;
User *user;

View File

@ -21,6 +21,7 @@
#include "user_map.h"
#include "exit_codes.h"
#include "log.h"
#include "portability.h"
User::User(const LEX_STRING *user_name_arg, const char *password)
{