svn commit: r584643 - /apr/apr/branches/1.2.x/test/testmmap.c

[wr...@apache.org]

Author: wrowe
Date: Sun Oct 14 17:09:18 2007
New Revision: 584643

URL: http://svn.apache.org/viewvc?rev=584643&view=rev
Log:
Test won't compile on AIX - stop overloading symbol names!

Backport: 584642

Modified:
    apr/apr/branches/1.2.x/test/testmmap.c

Modified: apr/apr/branches/1.2.x/test/testmmap.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/testmmap.c?rev=584643&r1=584642&r2=584643&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/testmmap.c (original)
+++ apr/apr/branches/1.2.x/test/testmmap.c Sun Oct 14 17:09:18 2007
@@ -39,8 +39,8 @@
 static apr_mmap_t *themmap = NULL;
 static apr_file_t *thefile = NULL;
 static char *file1;
-static apr_finfo_t finfo;
-static apr_size_t fsize;
+static apr_finfo_t thisfinfo;
+static apr_size_t thisfsize;
 
 static void create_filename(abts_case *tc, void *data)
 {
@@ -82,16 +82,16 @@
 {
     apr_status_t rv;
 
-    rv = apr_file_info_get(&finfo, APR_FINFO_NORM, thefile);
+    rv = apr_file_info_get(&thisfinfo, APR_FINFO_NORM, thefile);
     ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
-    ABTS_ASSERT(tc, "File size mismatch", fsize == finfo.size);
+    ABTS_ASSERT(tc, "File size mismatch", thisfsize == thisfinfo.size);
 }
 
 static void test_mmap_create(abts_case *tc, void *data)
 {
     apr_status_t rv;
 
-    rv = apr_mmap_create(&themmap, thefile, 0, (apr_size_t) finfo.size, 
+    rv = apr_mmap_create(&themmap, thefile, 0, (apr_size_t) thisfinfo.size, 
                                 APR_MMAP_READ, p);
     ABTS_PTR_NOTNULL(tc, themmap);
     ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
@@ -102,10 +102,10 @@
     
     ABTS_PTR_NOTNULL(tc, themmap);
     ABTS_PTR_NOTNULL(tc, themmap->mm);
-    ABTS_SIZE_EQUAL(tc, fsize, themmap->size);
+    ABTS_SIZE_EQUAL(tc, thisfsize, themmap->size);
 
     /* Must use nEquals since the string is not guaranteed to be NULL terminated */
-    ABTS_STR_NEQUAL(tc, themmap->mm, TEST_STRING, fsize);
+    ABTS_STR_NEQUAL(tc, themmap->mm, TEST_STRING, thisfsize);
 }
 
 static void test_mmap_delete(abts_case *tc, void *data)
@@ -126,7 +126,7 @@
     rv = apr_mmap_offset(&addr, themmap, 5);
 
     /* Must use nEquals since the string is not guaranteed to be NULL terminated */
-    ABTS_STR_NEQUAL(tc, addr, TEST_STRING + 5, fsize-5);
+    ABTS_STR_NEQUAL(tc, addr, TEST_STRING + 5, thisfsize-5);
 }
 #endif
 
@@ -135,7 +135,7 @@
     suite = ADD_SUITE(suite)
 
 #if APR_HAS_MMAP    
-    fsize = strlen(TEST_STRING);
+    thisfsize = strlen(TEST_STRING);
 
     abts_run_test(suite, create_filename, NULL);
     abts_run_test(suite, test_file_open, NULL);