summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/options.cc
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-08-05 20:44:52 +0200
committerunknown <joerg@mysql.com>2005-08-05 20:44:52 +0200
commitba6c1738cee56ac8fe5c6db8ffd6f9823c358dc1 (patch)
tree1ba1eb4cec1daaa9f855f95a0d41881cf41ea5a1 /server-tools/instance-manager/options.cc
parent2b458b8f972e41e31aca75d7a7f16033b2d1c3b8 (diff)
downloadmariadb-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/options.cc')
-rw-r--r--server-tools/instance-manager/options.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc
index 5d8483d3b0b..a9d31457d98 100644
--- a/server-tools/instance-manager/options.cc
+++ b/server-tools/instance-manager/options.cc
@@ -21,7 +21,7 @@
#include "options.h"
#include "priv.h"
-#include "port.h"
+#include "portability.h"
#include <my_sys.h>
#include <my_getopt.h>
#include <m_string.h>