svn commit: r983729 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[hw...@apache.org]

Author: hwright
Date: Mon Aug  9 16:51:33 2010
New Revision: 983729

URL: http://svn.apache.org/viewvc?rev=983729&view=rev
Log:
Add/shuffle some ifdef statements to exclude code from compiling when not
needed.

* subversion/libsvn_wc/wc_db.c
  (set_properties): Only compile with SVN__SUPPORT_BASE_MERGE.
  (svn_wc__db_temp_set_parent_stub_to_normal): Only define a couple of
    variables when not in SINGLE_DB.

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=983729&r1=983728&r2=983729&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Aug  9 16:51:33 2010
@@ -3773,6 +3773,7 @@ svn_wc__db_op_set_props(svn_wc__db_t *db
                                          scratch_pool));
 }
 
+#ifdef SVN__SUPPORT_BASE_MERGE
 
 /* Set properties in a given table. The row must exist.  */
 static svn_error_t *
@@ -3804,7 +3805,6 @@ set_properties(svn_wc__db_t *db,
   return SVN_NO_ERROR;
 }
 
-#ifdef SVN__SUPPORT_BASE_MERGE
 
 svn_error_t *
 svn_wc__db_temp_base_set_props(svn_wc__db_t *db,
@@ -9426,9 +9426,11 @@ svn_wc__db_temp_set_parent_stub_to_norma
 {
   svn_wc__db_pdh_t *pdh;
   const char *local_relpath;
-  svn_sqlite__stmt_t *stmt;
   const char *parent_abspath, *base;
+#ifndef SINGLE_DB
+  svn_sqlite__stmt_t *stmt;
   int affected_rows;
+#endif
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath)
                  && !svn_dirent_is_root(local_abspath, strlen(local_abspath)));