From 385d5fa23a1a510bb5def0311ae903883b1154e8 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Fri, 21 Jan 2011 23:24:13 +0000
Subject: Fix compile errors using readline on win32.

---
 bin/bbackupquery/bbackupquery.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp
index bc4cff13..b07a3ba7 100644
--- a/bin/bbackupquery/bbackupquery.cpp
+++ b/bin/bbackupquery/bbackupquery.cpp
@@ -163,6 +163,14 @@ char * completion_generator(const char *text, int state)
 	#define RL_COMPLETION_MATCHES rl_completion_matches
 #elif defined HAVE_COMPLETION_MATCHES
 	#define RL_COMPLETION_MATCHES completion_matches
+#else
+	char* no_matches[] = {NULL};
+	char** bbackupquery_completion_dummy(const char *text, 
+		char * (completion_generator)(const char *text, int state))
+	{
+		return no_matches;
+	}
+	#define RL_COMPLETION_MATCHES bbackupquery_completion_dummy
 #endif
 
 char ** bbackupquery_completion(const char *text, int start, int end)
@@ -215,15 +223,17 @@ int main(int argc, const char *argv[])
 	#endif
 
 #ifdef WIN32
-	const char* validOpts = "qvVwuc:l:o:O:W:";
+	#define WIN32_OPTIONS "u"
 	bool unicodeConsole = false;
-#elif defined HAVE_LIBREADLINE // && !WIN32
-	const char* validOpts = "qvVwEc:l:o:O:W:";
+#endif
+
+#ifdef HAVE_LIBREADLINE
+	#define READLINE_OPTIONS "E"
 	bool useReadline = true;
-#else
-	const char* validOpts = "qvVwc:l:o:O:W:";
 #endif
 
+	const char* validOpts = "qvVwc:l:o:O:W:" WIN32_OPTIONS READLINE_OPTIONS;
+
 	std::string fileLogFile;
 	Log::Level fileLogLevel = Log::INVALID;
 
@@ -316,7 +326,9 @@ int main(int argc, const char *argv[])
 		case 'u':
 			unicodeConsole = true;
 			break;
-#elif defined HAVE_LIBREADLINE // && !WIN32
+#endif
+
+#ifdef HAVE_LIBREADLINE
 		case 'E':
 			useReadline = false;
 			break;
-- 
cgit v1.2.3