Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1462768 - in /apr/apr/branches/1.5.x: ./
 test/testnames.c
Date: Sat, 30 Mar 2013 14:25:54 -0000
To: commits@apr.apache.org
From: trawick@apache.org
Message-Id: <20130330142554.28DF52388847@eris.apache.org>

Author: trawick
Date: Sat Mar 30 14:25:53 2013
New Revision: 1462768

URL: http://svn.apache.org/r1462768
Log:
merge r1460405 from trunk

hide an unused variable on Unix

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/test/testnames.c

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1460405

Modified: apr/apr/branches/1.5.x/test/testnames.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/testnames.c?rev=1462768&r1=1462767&r2=1462768&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/testnames.c (original)
+++ apr/apr/branches/1.5.x/test/testnames.c Sat Mar 30 14:25:53 2013
@@ -228,7 +228,9 @@ static void root_from_cwd_and_back(abts_
     const char *path = "//";
     char *origpath;
     char *testpath;
+#if defined(WIN32) || defined(OS2) || defined(NETWARE)
     int hadfailed;
+#endif
 
     ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_filepath_get(&origpath, 0, p));
     path = origpath;
@@ -267,7 +269,9 @@ static void root_from_cwd_and_back(abts_
                           | APR_FILEPATH_NOTABOVEROOT
                           | APR_FILEPATH_NOTRELATIVE, p);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+#if defined(WIN32) || defined(OS2) || defined(NETWARE)
     hadfailed = tc->failed;
+#endif
     /* The API doesn't promise equality!!! 
      * apr_filepath_get never promised a canonical filepath.
      * We'll emit noise under verbose so the user is aware,