svn commit: r1714172 - in /subversion/branches/move-tracking-2/tools/dev/svnmover: svnmover.c svnmover.h util.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Nov 13 09:55:06 2015
New Revision: 1714172

URL: http://svn.apache.org/viewvc?rev=1714172&view=rev
Log:
On the 'move-tracking-2' branch: Fix the Windows build.

* tools/dev/svnmover/svnmover.h
  (HAVE_LINENOISE): Define here, but not on Windows.
  (use_coloured_output): Define even on Windows where coloured output is not
    currently implemented, so that the option-handling code can still
    compile and run.

* tools/dev/svnmover/svnmover.c
  (HAVE_LINENOISE): Don't define here.

* tools/dev/svnmover/util.c
  (HAVE_LINENOISE): Don't define here.

Modified:
    subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c
    subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.h
    subversion/branches/move-tracking-2/tools/dev/svnmover/util.c

Modified: subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c?rev=1714172&r1=1714171&r2=1714172&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c Fri Nov 13 09:55:06 2015
@@ -55,7 +55,6 @@
 #include "private/svn_client_private.h"
 #include "../libsvn_delta/debug_editor.h"
 
-#define HAVE_LINENOISE
 #ifdef HAVE_LINENOISE
 #include "linenoise/linenoise.h"
 #endif
@@ -99,6 +98,8 @@ static const svn_token_map_t ui_mode_map
   (strcmp(svn_branch__get_id(branch1, scratch_pool), \
           svn_branch__get_id(branch2, scratch_pool)) == 0)
 
+static svn_boolean_t use_coloured_output = FALSE;
+
 #ifndef WIN32
 
 /* Some ANSI escape codes for controlling text colour in terminal output. */
@@ -120,8 +121,6 @@ static const svn_token_map_t ui_mode_map
 #define TEXT_BG_CYAN    "\x1b[46m"
 #define TEXT_BG_WHITE   "\x1b[47m"
 
-static svn_boolean_t use_coloured_output = FALSE;
-
 #define settext(text_attr) \
   do { \
     if (use_coloured_output) \

Modified: subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.h?rev=1714172&r1=1714171&r2=1714172&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.h (original)
+++ subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.h Fri Nov 13 09:55:06 2015
@@ -33,6 +33,13 @@
 
 #include "private/svn_branch.h"
 
+/* Decide whether to use the 'linenoise' library for command-line input
+   editing and completion. */
+#ifndef WIN32
+#define HAVE_LINENOISE
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

Modified: subversion/branches/move-tracking-2/tools/dev/svnmover/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/svnmover/util.c?rev=1714172&r1=1714171&r2=1714172&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/svnmover/util.c (original)
+++ subversion/branches/move-tracking-2/tools/dev/svnmover/util.c Fri Nov 13 09:55:06 2015
@@ -23,7 +23,6 @@
 
 #include "svnmover.h"
 
-#define HAVE_LINENOISE
 #ifdef HAVE_LINENOISE
 #include "linenoise/linenoise.c"
 #endif