apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r651722 - /apr/apr/branches/1.3.x/file_io/unix/copy.c
Date Fri, 25 Apr 2008 22:33:52 GMT
Author: bojan
Date: Fri Apr 25 15:33:40 2008
New Revision: 651722

URL: http://svn.apache.org/viewvc?rev=651722&view=rev
Log:
Backport r651721 from the trunk
Rework possibly non-portable constant expression

Modified:
    apr/apr/branches/1.3.x/file_io/unix/copy.c

Modified: apr/apr/branches/1.3.x/file_io/unix/copy.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/file_io/unix/copy.c?rev=651722&r1=651721&r2=651722&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/file_io/unix/copy.c (original)
+++ apr/apr/branches/1.3.x/file_io/unix/copy.c Fri Apr 25 15:33:40 2008
@@ -52,10 +52,15 @@
         return status;
     }
 
+#if BUFSIZ > APR_FILE_DEFAULT_BUFSIZE
+#define COPY_BUFSIZ BUFSIZ
+#else
+#define COPY_BUFSIZ APR_FILE_DEFAULT_BUFSIZE
+#endif
+
     /* Copy bytes till the cows come home. */
     while (1) {
-        char buf[BUFSIZ > APR_FILE_DEFAULT_BUFSIZE ? BUFSIZ
-                                                   : APR_FILE_DEFAULT_BUFSIZE];
+        char buf[COPY_BUFSIZ];
         apr_size_t bytes_this_time = sizeof(buf);
         apr_status_t read_err;
         apr_status_t write_err;



Mime
View raw message