diff options
| author | unknown <vva@genie.(none)> | 2002-11-19 18:26:53 +0400 |
|---|---|---|
| committer | unknown <vva@genie.(none)> | 2002-11-19 18:26:53 +0400 |
| commit | 953f6c51fed3478cc3905d2ce15728e5c3e7f00c (patch) | |
| tree | 6f25883717e7c6cfc40b292a86148e469567534c /readline/histlib.h | |
| parent | 0fb3b8d9abc3eb2e3072c2f8681099e7db0a256e (diff) | |
| download | mariadb-git-953f6c51fed3478cc3905d2ce15728e5c3e7f00c.tar.gz | |
upgrade readline to version 4.3
client/completion_hash.cc:
correct headers of functions for readline 4.3 (add const modifier to char*)
client/completion_hash.h:
correct headers of functions for readline 4.3 (add const modifier to char*)
client/mysql.cc:
correct functions for readline 4.3
Diffstat (limited to 'readline/histlib.h')
| -rw-r--r-- | readline/histlib.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/readline/histlib.h b/readline/histlib.h index 422cf5974db..c39af71814c 100644 --- a/readline/histlib.h +++ b/readline/histlib.h @@ -6,7 +6,7 @@ The Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 1, or (at your option) + the Free Software Foundation; either version 2, or (at your option) any later version. The Library is distributed in the hope that it will be useful, but @@ -17,27 +17,24 @@ The GNU General Public License is often shipped with GNU software, and is generally kept in a file called COPYING or LICENSE. If you do not have a copy of the license, write to the Free Software Foundation, - 675 Mass Ave, Cambridge, MA 02139, USA. */ + 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ #if !defined (_HISTLIB_H_) #define _HISTLIB_H_ -/* Function pointers can be declared as (Function *)foo. */ -#if !defined (_FUNCTION_DEF) -# define _FUNCTION_DEF -typedef int Function (); -typedef void VFunction (); -typedef char *CPFunction (); -typedef char **CPPFunction (); -#endif /* _FUNCTION_DEF */ +#if defined (HAVE_STRING_H) +# include <string.h> +#else +# include <strings.h> +#endif /* !HAVE_STRING_H */ +#if !defined (STREQ) #define STREQ(a, b) (((a)[0] == (b)[0]) && (strcmp ((a), (b)) == 0)) -#define STREQN(a, b, n) (((a)[0] == (b)[0]) && (strncmp ((a), (b), (n)) == 0)) +#define STREQN(a, b, n) (((n) == 0) ? (1) \ + : ((a)[0] == (b)[0]) && (strncmp ((a), (b), (n)) == 0)) +#endif #ifndef savestring -# ifndef strcpy -extern char *strcpy (); -# endif #define savestring(x) strcpy (xmalloc (1 + strlen (x)), (x)) #endif @@ -79,4 +76,7 @@ extern char *strchr (); #define HISTORY_APPEND 0 #define HISTORY_OVERWRITE 1 +/* Some variable definitions shared across history source files. */ +extern int history_offset; + #endif /* !_HISTLIB_H_ */ |