summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-02-28 14:32:40 +0200
committerunknown <monty@narttu.mysql.fi>2003-02-28 14:32:40 +0200
commitc2af53fedf0ee40ce470f2ff483711c4a097171b (patch)
tree9915e21c45ef2102c75cb9a3b453898e3f90a2eb /cmd-line-utils
parent2e16ca08fc6818f532475381536bfdb2055cb5fb (diff)
downloadmariadb-git-c2af53fedf0ee40ce470f2ff483711c4a097171b.tar.gz
Portability fixes
cmd-line-utils/libedit/readline.c: Portability fix (For IRIX) include/my_global.h: Portability fix (For Tru64) include/my_xml.h: Portability fix (True64) ('leave' is already defined) strings/xml.c: Portability fix (True64)
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/libedit/readline.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-line-utils/libedit/readline.c b/cmd-line-utils/libedit/readline.c
index 863ee064ab0..9069b46d1f8 100644
--- a/cmd-line-utils/libedit/readline.c
+++ b/cmd-line-utils/libedit/readline.c
@@ -1239,7 +1239,7 @@ filename_completion_function(const char *text, int state)
/* otherwise, get first entry where first */
/* filename_len characters are equal */
if (entry->d_name[0] == filename[0]
-#if defined(__SVR4) || defined(__linux__)
+#ifdef HAVE_DIRENT_H
&& strlen(entry->d_name) >= filename_len
#else
&& entry->d_namlen >= filename_len
@@ -1252,7 +1252,7 @@ filename_completion_function(const char *text, int state)
if (entry) { /* match found */
struct stat stbuf;
-#if defined(__SVR4) || defined(__linux__)
+#ifdef HAVE_DIRENT_H
len = strlen(entry->d_name) +
#else
len = entry->d_namlen +