mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
New "Instance Manager" code:
Rename "port.h" to "portability.h" to avoid conflict with system header file name, and include the file in "Makefile.am". server-tools/instance-manager/Makefile.am: Ensure that the (recently added) header "portability.h" (renamed from "port.h") gets included in the source packages. server-tools/instance-manager/guardian.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/instance.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/instance_options.h: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/listener.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/log.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/mysqlmanager.vcproj: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/options.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/parse_output.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/portability.h: Adapt the protective CPP symbol to the changed file name. server-tools/instance-manager/priv.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/priv.h: Rename "port.h" to "portability.h" to avoid conflict with system header file name.
This commit is contained in:
25
server-tools/instance-manager/portability.h
Normal file
25
server-tools/instance-manager/portability.h
Normal file
@@ -0,0 +1,25 @@
|
||||
#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
|
||||
#define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
|
||||
|
||||
#ifdef __WIN__
|
||||
|
||||
#define vsnprintf _vsnprintf
|
||||
|
||||
#define SIGKILL 9
|
||||
#define SHUT_RDWR 0x2
|
||||
|
||||
//TODO: fix this
|
||||
#define DEFAULT_MONITORING_INTERVAL 20
|
||||
#define DEFAULT_PORT 2273
|
||||
#define PROTOCOL_VERSION 10
|
||||
|
||||
typedef int pid_t;
|
||||
|
||||
#undef popen
|
||||
#define popen(A,B) _popen(A,B)
|
||||
|
||||
#endif /* __WIN__ */
|
||||
|
||||
#endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user