diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /extra/readline | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'extra/readline')
| -rw-r--r-- | extra/readline/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | extra/readline/history.h | 4 | ||||
| -rw-r--r-- | extra/readline/keymaps.h | 6 | ||||
| -rw-r--r-- | extra/readline/readline.h | 8 | ||||
| -rw-r--r-- | extra/readline/xmalloc.h | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/extra/readline/CMakeLists.txt b/extra/readline/CMakeLists.txt index e245a2cd435..bdecdd1fcce 100644 --- a/extra/readline/CMakeLists.txt +++ b/extra/readline/CMakeLists.txt @@ -13,8 +13,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/extra) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEFINITIONS(-DHAVE_CONFIG_H -DNO_KILL_INTR) diff --git a/extra/readline/history.h b/extra/readline/history.h index 59aad6a4e20..c196b0361e3 100644 --- a/extra/readline/history.h +++ b/extra/readline/history.h @@ -32,8 +32,8 @@ extern "C" { # include "rlstdc.h" # include "rltypedefs.h" #else -# include <readline/rlstdc.h> -# include <readline/rltypedefs.h> +# include <rlstdc.h> +# include <rltypedefs.h> #endif #ifdef __STDC__ diff --git a/extra/readline/keymaps.h b/extra/readline/keymaps.h index eb28a8ecc33..1de567ddc1e 100644 --- a/extra/readline/keymaps.h +++ b/extra/readline/keymaps.h @@ -32,9 +32,9 @@ extern "C" { # include "chardefs.h" # include "rltypedefs.h" #else -# include <readline/rlstdc.h> -# include <readline/chardefs.h> -# include <readline/rltypedefs.h> +# include <rlstdc.h> +# include <chardefs.h> +# include <rltypedefs.h> #endif /* A keymap contains one entry for each key in the ASCII set. diff --git a/extra/readline/readline.h b/extra/readline/readline.h index 8ed1b84172e..867b2e71641 100644 --- a/extra/readline/readline.h +++ b/extra/readline/readline.h @@ -33,10 +33,10 @@ extern "C" { # include "keymaps.h" # include "tilde.h" #else -# include <readline/rlstdc.h> -# include <readline/rltypedefs.h> -# include <readline/keymaps.h> -# include <readline/tilde.h> +# include <rlstdc.h> +# include <rltypedefs.h> +# include <keymaps.h> +# include <tilde.h> #endif /* Hex-encoded Readline version number. */ diff --git a/extra/readline/xmalloc.h b/extra/readline/xmalloc.h index fafb44fcffd..58b17f39f3d 100644 --- a/extra/readline/xmalloc.h +++ b/extra/readline/xmalloc.h @@ -26,7 +26,7 @@ #if defined (READLINE_LIBRARY) # include "rlstdc.h" #else -# include <readline/rlstdc.h> +# include <rlstdc.h> #endif #ifndef PTR_T |