mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
fix compilation failure on serg's box: we shouldn't
use USE_PRAGMA_INTERFACE before include of my_global.h, where it is defined server-tools/instance-manager/command.h: don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined server-tools/instance-manager/listener.h: don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined server-tools/instance-manager/mysql_connection.h: don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined server-tools/instance-manager/options.h: don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined server-tools/instance-manager/thread_registry.cc: fix register server-tools/instance-manager/thread_registry.h: don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined server-tools/instance-manager/user_map.h: don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
This commit is contained in:
parent
34a2fa26f9
commit
8b9e392edf
7 changed files with 20 additions and 21 deletions
|
@ -16,12 +16,12 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
#include <my_global.h>
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include <my_global.h>
|
||||
|
||||
/* Class responsible for allocation of im commands. */
|
||||
|
||||
class Instance_map;
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
#include <my_global.h>
|
||||
#include <my_pthread.h>
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include <my_global.h>
|
||||
#include <my_pthread.h>
|
||||
|
||||
|
||||
pthread_handler_t listener(void *arg);
|
||||
|
||||
|
|
|
@ -16,13 +16,12 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include <my_global.h>
|
||||
#include <my_pthread.h>
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
pthread_handler_t mysql_connection(void *arg);
|
||||
|
||||
|
|
|
@ -16,16 +16,16 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
/*
|
||||
Options - all possible options for the instance manager grouped in one
|
||||
struct.
|
||||
*/
|
||||
#include <my_global.h>
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
struct Options
|
||||
{
|
||||
#ifdef __WIN__
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* cOPYRIght (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
||||
/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
|
@ -50,13 +50,12 @@
|
|||
in manner, similar to ``quit'' signals.
|
||||
*/
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include <my_global.h>
|
||||
#include <my_pthread.h>
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
/*
|
||||
Thread_info - repository entry for each worker thread
|
||||
|
|
|
@ -16,15 +16,16 @@
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
#include <my_global.h>
|
||||
|
||||
#include <my_sys.h>
|
||||
#include <hash.h>
|
||||
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
/*
|
||||
User_map -- all users and passwords
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue