You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/06/04 10:11:08 UTC
svn commit: r544085 - in /webservices/axis2/trunk/c/util/include:
axutil_config.h platforms/unix/axutil_unix.h
Author: samisa
Date: Mon Jun 4 01:11:05 2007
New Revision: 544085
URL: http://svn.apache.org/viewvc?view=rev&rev=544085
Log:
Fixed the macro conflicts with APR
Added:
webservices/axis2/trunk/c/util/include/axutil_config.h
Modified:
webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h
Added: webservices/axis2/trunk/c/util/include/axutil_config.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_config.h?view=auto&rev=544085
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_config.h (added)
+++ webservices/axis2/trunk/c/util/include/axutil_config.h Mon Jun 4 01:11:05 2007
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+#ifndef AXUTIL_CONFIG_H
+#define AXUTIL_CONFIG_H
+
+/* undef unwated cnfig macros to avoid conflicts with APR macros */
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef VERSION
+
+#include <config.h>
+
+/* undef unwated cnfig macros to avoid conflicts with APR macros */
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef VERSION
+
+#endif /* AXIS2_UTILS_H */
+
Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h?view=diff&rev=544085&r1=544084&r2=544085
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h Mon Jun 4 01:11:05 2007
@@ -19,7 +19,7 @@
#ifndef AXIS2_UNIX_H
#define AXIS2_UNIX_H
-#include <config.h>
+#include <axutil_config.h>
/**
* @file axutil_unix.h
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org