You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2005/01/05 20:51:36 UTC

svn commit: r124258 - /apr/apr-util/trunk/ldap/apr_ldap_init.c /apr/apr-util/trunk/ldap/apr_ldap_url.c

Author: wrowe
Date: Wed Jan  5 11:51:35 2005
New Revision: 124258

URL: http://svn.apache.org/viewcvs?view=rev&rev=124258
Log:

  Quit using unique #include conventions.  Also solve misc Win32 (possibly
  netware) build issues, as some platforms need apr.h/apu.h before anything
  else is included.

Modified:
   apr/apr-util/trunk/ldap/apr_ldap_init.c
   apr/apr-util/trunk/ldap/apr_ldap_url.c

Modified: apr/apr-util/trunk/ldap/apr_ldap_init.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/apr_ldap_init.c?view=diff&rev=124258&p1=apr/apr-util/trunk/ldap/apr_ldap_init.c&r1=124257&p2=apr/apr-util/trunk/ldap/apr_ldap_init.c&r2=124258
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_init.c	(original)
+++ apr/apr-util/trunk/ldap/apr_ldap_init.c	Wed Jan  5 11:51:35 2005
@@ -21,11 +21,12 @@
  * Copyright 1999-2001 Dave Carrigan
  */
 
-#include <apu.h>
-#include <apr_ldap.h>
-#include <apr_errno.h>
-#include <apr_pools.h>
-#include <apr_strings.h>
+#include "apr.h"
+#include "apu.h"
+#include "apr_ldap.h"
+#include "apr_errno.h"
+#include "apr_pools.h"
+#include "apr_strings.h"
 
 #if APR_HAS_LDAP
 

Modified: apr/apr-util/trunk/ldap/apr_ldap_url.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/apr_ldap_url.c?view=diff&rev=124258&p1=apr/apr-util/trunk/ldap/apr_ldap_url.c&r1=124257&p2=apr/apr-util/trunk/ldap/apr_ldap_url.c&r2=124258
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_url.c	(original)
+++ apr/apr-util/trunk/ldap/apr_ldap_url.c	Wed Jan  5 11:51:35 2005
@@ -69,6 +69,9 @@
  *  Tolerates URLs that look like: <ldapurl> and <URL:ldapurl>
  */
 
+#include "apu.h"
+#include "apr_pools.h"
+#include "apr_strings.h"
 #include "apr_ldap.h"
 
 #if APR_HAS_LDAP
@@ -76,10 +79,6 @@
 #if APR_HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-
-#include "apu.h"
-#include "apr_pools.h"
-#include "apr_strings.h"
 
 #ifndef LDAPS_PORT
 #define LDAPS_PORT              636  /* ldaps:/// default LDAP over TLS port */