From ff767886eecd985ee9af28861ef6ce177b849040 Mon Sep 17 00:00:00 2001 From: Eliot Horowitz Date: Fri, 18 Mar 2011 15:17:40 -0400 Subject: [PATCH] use linenoise as cpp --- SConstruct | 2 +- shell/dbshell.cpp | 3 +-- third_party/linenoise/{linenoise.c => linenoise.cpp} | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename third_party/linenoise/{linenoise.c => linenoise.cpp} (100%) diff --git a/SConstruct b/SConstruct index 2c5b376982a..2b7e2aad929 100644 --- a/SConstruct +++ b/SConstruct @@ -1189,7 +1189,7 @@ elif not onlyServer: coreShellFiles = [ "shell/dbshell.cpp" , "shell/shell_utils.cpp" , "shell/mongo-server.cpp" ] if not windows: - coreShellFiles.append( "third_party/linenoise/linenoise.c" ) + coreShellFiles.append( "third_party/linenoise/linenoise.cpp" ) if weird: shell32BitFiles = coreShellFiles diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp index 6b9a99b9221..48275097f76 100644 --- a/shell/dbshell.cpp +++ b/shell/dbshell.cpp @@ -20,9 +20,8 @@ #ifndef WIN32 #define USE_LINENOISE -extern "C" { + #include "../third_party/linenoise/linenoise.h" -} // this is for ctrl-c handling #include diff --git a/third_party/linenoise/linenoise.c b/third_party/linenoise/linenoise.cpp similarity index 100% rename from third_party/linenoise/linenoise.c rename to third_party/linenoise/linenoise.cpp