[Box Backup-commit] COMMIT r2878 - box/trunk/bin/bbackupquery

[subversion at boxbackup.org]

Author: chris
Date: 2011-03-26 23:25:17 +0000 (Sat, 26 Mar 2011)
New Revision: 2878

Modified:
   box/trunk/bin/bbackupquery/CommandCompletion.cpp
Log:
Eliminate nested macros to fix compile with MSVC 2010.


Modified: box/trunk/bin/bbackupquery/CommandCompletion.cpp
===================================================================
--- box/trunk/bin/bbackupquery/CommandCompletion.cpp	2011-03-26 23:24:53 UTC (rev 2877)
+++ box/trunk/bin/bbackupquery/CommandCompletion.cpp	2011-03-26 23:25:17 UTC (rev 2878)
@@ -81,14 +81,16 @@
 	#define HAVE_A_FILENAME_COMPLETION_FUNCTION 1
 #endif
 
+#ifdef HAVE_A_FILENAME_COMPLETION_FUNCTION
 COMPLETION_FUNCTION(Default,
-#ifdef HAVE_A_FILENAME_COMPLETION_FUNCTION
 	while (const char *match = RL_FILENAME_COMPLETION_FUNCTION(prefix.c_str(), 0))
 	{
 		completions.push_back(match);
 	}
+)
+#else // !HAVE_A_FILENAME_COMPLETION_FUNCTION
+COMPLETION_FUNCTION(Default,)
 #endif // HAVE_A_FILENAME_COMPLETION_FUNCTION
-)
 
 COMPLETION_FUNCTION(Command,
 	int len = prefix.length();