diff options
| author | unknown <joerg@mysql.com> | 2005-08-05 20:44:52 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-08-05 20:44:52 +0200 |
| commit | ba6c1738cee56ac8fe5c6db8ffd6f9823c358dc1 (patch) | |
| tree | 1ba1eb4cec1daaa9f855f95a0d41881cf41ea5a1 /server-tools/instance-manager/port.h | |
| parent | 2b458b8f972e41e31aca75d7a7f16033b2d1c3b8 (diff) | |
| download | mariadb-git-ba6c1738cee56ac8fe5c6db8ffd6f9823c358dc1.tar.gz | |
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.
Diffstat (limited to 'server-tools/instance-manager/port.h')
| -rw-r--r-- | server-tools/instance-manager/port.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/server-tools/instance-manager/port.h b/server-tools/instance-manager/port.h deleted file mode 100644 index 3b1c3e2ad93..00000000000 --- a/server-tools/instance-manager/port.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORT_H -#define INCLUDES_MYSQL_INSTANCE_MANAGER_PORT_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_PORT_H */ - - |