apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r591170 - in /apr/apr-util/branches/1.2.x/include: apu.hnw private/apu_config.hnw
Date Fri, 02 Nov 2007 00:10:02 GMT
Author: fuankg
Date: Thu Nov  1 17:10:01 2007
New Revision: 591170

URL: http://svn.apache.org/viewvc?rev=591170&view=rev
Log:
moved some defines to private header.

Added:
    apr/apr-util/branches/1.2.x/include/private/apu_config.hnw   (with props)
Modified:
    apr/apr-util/branches/1.2.x/include/apu.hnw

Modified: apr/apr-util/branches/1.2.x/include/apu.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apu.hnw?rev=591170&r1=591169&r2=591170&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apu.hnw (original)
+++ apr/apr-util/branches/1.2.x/include/apu.hnw Thu Nov  1 17:10:01 2007
@@ -21,15 +21,16 @@
 /* @file apu.h
  * @brief APR-Utility main file
  */
+
+#ifdef NETWARE
+#ifndef APU_H
+#define APU_H
 /**
  * @defgroup APR_Util APR Utility Functions
  * @{
  */
 
 
-#ifndef APU_H
-#define APU_H
-
 /**
  * APU_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library,
  * so that all public symbols are exported.
@@ -71,27 +72,19 @@
  * we always have SDBM (it's in our codebase)
  */
 #define APU_HAVE_SDBM   1
+#define APU_HAVE_NDBM   0
 #define APU_HAVE_GDBM   0
 #define APU_HAVE_DB     0
 
-
-#define HAVE_ICONV_H           1
 #define APU_HAVE_APR_ICONV     0
 #define APU_HAVE_ICONV         1
 #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
-/*
- * check for newer NDKs which use now correctly 'const char*' with iconv.
- */
-#include <ndkvers.h>
-#if (CURRENT_NDK_THRESHOLD >= 705110000)
-#define APU_ICONV_INBUF_CONST
-#endif
-
 /* 
  * Hack to enable dynamic loads within apr_dbd
  */
 #define APR_DSO_BUILD APR_HAS_DSO
 
 #endif /* APU_H */
-/** @} */
+#endif /* NETWARE */
+

Added: apr/apr-util/branches/1.2.x/include/private/apu_config.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/private/apu_config.hnw?rev=591170&view=auto
==============================================================================
--- apr/apr-util/branches/1.2.x/include/private/apu_config.hnw (added)
+++ apr/apr-util/branches/1.2.x/include/private/apu_config.hnw Thu Nov  1 17:10:01 2007
@@ -0,0 +1,50 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Note: This is a NetWare specific version of apu_config.hnw. It is copied
+ * as apu_config.h at the start of a NetWare build.
+ */
+
+#ifdef NETWARE
+
+#ifndef APU_CONFIG_H
+#define APU_CONFIG_H
+
+/*
+ * NetWare does not have GDBM, and we always use the bundled (new) Expat
+ */
+
+/* Define if you have the gdbm library (-lgdbm). */
+/* #undef HAVE_LIBGDBM */
+
+/* define if Expat 1.0 or 1.1 was found */
+/* #undef APR_HAVE_OLD_EXPAT */
+
+/* NetWare uses its own ICONV implementation. */
+#define HAVE_ICONV_H 1
+
+/*
+ * check for newer NDKs which use now correctly 'const char*' with iconv.
+ */
+#include <ndkvers.h>
+#if (CURRENT_NDK_THRESHOLD >= 705110000)
+#define APU_ICONV_INBUF_CONST
+#endif
+
+#endif /* APU_CONFIG_H */
+#endif /* NETWARE */
+

Propchange: apr/apr-util/branches/1.2.x/include/private/apu_config.hnw
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message