You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2009/05/26 17:57:51 UTC
svn commit: r778778 - /httpd/httpd/trunk/support/logresolve.c
Author: takashi
Date: Tue May 26 15:57:51 2009
New Revision: 778778
URL: http://svn.apache.org/viewvc?rev=778778&view=rev
Log:
Remove the conditional for APR >= 1.3.
httpd 2.3 has needed APR 1.3 or later since r582069.
Modified:
httpd/httpd/trunk/support/logresolve.c
Modified: httpd/httpd/trunk/support/logresolve.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/logresolve.c?rev=778778&r1=778777&r2=778778&view=diff
==============================================================================
--- httpd/httpd/trunk/support/logresolve.c (original)
+++ httpd/httpd/trunk/support/logresolve.c Tue May 26 15:57:51 2009
@@ -138,10 +138,8 @@
apr_status_t status;
const char * arg;
char * stats = NULL;
-#if APR_MAJOR_VERSION > 1 || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 3)
char * inbuffer;
char * outbuffer;
-#endif
char line[LINE_BUF_SIZE];
int doublelookups = 0;
@@ -190,7 +188,6 @@
apr_file_open_stdout(&outfile, pool);
apr_file_open_stdin(&infile, pool);
-#if APR_MAJOR_VERSION > 1 || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 3)
/* Allocate two new 10k file buffers */
if ((outbuffer = apr_palloc(pool, WRITE_BUF_SIZE)) == NULL ||
(inbuffer = apr_palloc(pool, READ_BUF_SIZE)) == NULL) {
@@ -200,7 +197,6 @@
/* Set the buffers */
apr_file_buffer_set(infile, inbuffer, READ_BUF_SIZE);
apr_file_buffer_set(outfile, outbuffer, WRITE_BUF_SIZE);
-#endif
cache = apr_hash_make(pool);
if(apr_pool_create(&pline, pool) != APR_SUCCESS){