Author: hwright
Date: Wed Sep 1 17:36:47 2010
New Revision: 991618
URL: http://svn.apache.org/viewvc?rev=991618&view=rev
Log:
Don't interleave a #define inside another macro. (The windows build doesn't
like this too much.)
* subversion/libsvn_wc/wc_db.c
(temp_cross_db_copy): As above.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=991618&r1=991617&r2=991618&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Sep 1 17:36:47 2010
@@ -2937,12 +2937,16 @@ temp_cross_db_copy(svn_wc__db_t *db,
svn_boolean_t have_row;
svn_depth_t depth;
+#ifdef SVN_WC__SINGLE_DB
+ SVN_ERR_ASSERT(kind == svn_wc__db_kind_file
+ || kind == svn_wc__db_kind_dir
+ );
+#else
SVN_ERR_ASSERT(kind == svn_wc__db_kind_file
|| kind == svn_wc__db_kind_dir
-#ifndef SVN_WC__SINGLE_DB
|| kind == svn_wc__db_kind_subdir
-#endif
);
+#endif
SVN_ERR(svn_wc__db_read_info(NULL /* status */,
NULL /* kind */,
