summaryrefslogtreecommitdiff
path: root/cmd-line-utils/readline/display.c
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2005-10-04 18:20:57 +0300
committerunknown <jani@ua141d10.elisa.omakaista.fi>2005-10-04 18:20:57 +0300
commitdee0ea4b6c93ab7550e39293655f1b3b65cc3b7c (patch)
tree6a14638a32646753fac39b1c2811ab785c0f0f3e /cmd-line-utils/readline/display.c
parentee6e983c5ce9a33a29d5b30391660c67c3de6653 (diff)
downloadmariadb-git-dee0ea4b6c93ab7550e39293655f1b3b65cc3b7c.tar.gz
Some fixes including implicit declaration of a function,
using wrong type in assignment etc. cmd-line-utils/readline/complete.c: Fixed problem with implicitely defining wcwidth() in case when compiling with icc. cmd-line-utils/readline/display.c: Fixed problem with implicitely defining wcwidth() in case when compiling with icc. cmd-line-utils/readline/mbutil.c: Fixed problem with implicitely defining wcwidth() in case when compiling with icc. server-tools/instance-manager/protocol.cc: Fixed some types from int to char. Made ERROR_PACKET_CODE static global variable in this file. sql/log.cc: Removed warning of unused goto when not in debug mode.
Diffstat (limited to 'cmd-line-utils/readline/display.c')
-rw-r--r--cmd-line-utils/readline/display.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c
index cab76c0da81..372feeaffea 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -25,6 +25,11 @@
#include <sys/types.h>
+/* To get SuSE 9.3 to define wcwidth() (in wchar.h) */
+#ifndef __USE_XOPEN
+#define __USE_XOPEN
+#endif
+
#if defined (HAVE_UNISTD_H)
# include <unistd.h>
#endif /* HAVE_UNISTD_H */
@@ -43,6 +48,10 @@
#include "rldefs.h"
#include "rlmbutil.h"
+#ifdef HAVE_WCHAR_H
+#include <wchar.h>
+#endif
+
/* Termcap library stuff. */
#include "tcap.h"