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 da...@apache.org on 2006/05/18 06:20:04 UTC
svn commit: r407453 - in /webservices/axis2/trunk/c: include/
modules/util/include/ modules/util/include/platforms/unix/
Author: damitha
Date: Wed May 17 21:20:02 2006
New Revision: 407453
URL: http://svn.apache.org/viewvc?rev=407453&view=rev
Log:
more changes
Added:
webservices/axis2/trunk/c/modules/util/include/axis2_thread.h
- copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_thread.h
Removed:
webservices/axis2/trunk/c/include/axis2_thread.h
Modified:
webservices/axis2/trunk/c/include/axis2_const.h
webservices/axis2/trunk/c/include/axis2_defines.h
webservices/axis2/trunk/c/modules/util/include/axis2_allocator.h
webservices/axis2/trunk/c/modules/util/include/axis2_class_loader.h
webservices/axis2/trunk/c/modules/util/include/axis2_dir_handler.h
webservices/axis2/trunk/c/modules/util/include/axis2_dll_desc.h
webservices/axis2/trunk/c/modules/util/include/axis2_error.h
webservices/axis2/trunk/c/modules/util/include/axis2_file.h
webservices/axis2/trunk/c/modules/util/include/axis2_generic_obj.h
webservices/axis2/trunk/c/modules/util/include/axis2_network_handler.h
webservices/axis2/trunk/c/modules/util/include/axis2_param_container.h
webservices/axis2/trunk/c/modules/util/include/axis2_property.h
webservices/axis2/trunk/c/modules/util/include/axis2_stream.h
webservices/axis2/trunk/c/modules/util/include/axis2_thread_pool.h
webservices/axis2/trunk/c/modules/util/include/axis2_url.h
webservices/axis2/trunk/c/modules/util/include/axis2_utils.h
webservices/axis2/trunk/c/modules/util/include/axis2_uuid_gen.h
webservices/axis2/trunk/c/modules/util/include/platforms/unix/axis2_uuid_gen_unix.h
Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Wed May 17 21:20:02 2006
@@ -23,64 +23,7 @@
*/
#include <axis2_env.h>
-
-/** This macro is called to check whether structure on which function is called
- * is NULL and to check whether the environment structure passed is valid.
- * @param object structure on which function is called
- * @param env environment to be checked for validity
- * @param error_return If function return a status it should pass here
- * AXIS2_FAILURE. If function return a type pointer it should
- * pass NULL
- * @return If function return a status code return AXIS2_SUCCESS. Else if
- * function return a type pointer return NULL
- */
-#define AXIS2_FUNC_PARAM_CHECK(object, env, error_return) \
- AXIS2_ENV_CHECK(env, error_return);\
- if (!object) \
- { \
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM); \
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE); \
- return error_return; \
- } \
- else \
- { \
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_SUCCESS); \
- }
-
-/**This macro is called to check whether an object is NULL.
- * if object is NULL error number and status code is set
- * @param object object to be check for NULL
- * @param error_return If function return a status it should pass here
- * AXIS2_FAILURE. If function return a type pointer it should
- * pass NULL
- * @return If function return a status code return AXIS2_SUCCESS. Else if
- * function return a type pointer return NULL
- */
-#define AXIS2_PARAM_CHECK(error, object, error_return) \
- if (!object) \
- { \
- AXIS2_ERROR_SET_ERROR_NUMBER(error, AXIS2_ERROR_INVALID_NULL_PARAM); \
- AXIS2_ERROR_SET_STATUS_CODE(error, AXIS2_FAILURE); \
- return error_return; \
- } \
- else \
- { \
- AXIS2_ERROR_SET_STATUS_CODE(error, AXIS2_SUCCESS); \
- }
-
-/**This macro is used to handle error situation.
- * @param error_number Error number for the error occured
- * @param error_return If function return a status it should pass here
- * AXIS2_FAILURE. If function return a type pointer it should
- * pass NULL
- * @return If function return a status code return AXIS2_SUCCESS. Else if
- * function return a type pointer return NULL
- */
-#define AXIS2_ERROR_SET(error, error_number, status_code) \
- { \
- AXIS2_ERROR_SET_ERROR_NUMBER(error, error_number); \
- AXIS2_ERROR_SET_STATUS_CODE(error, status_code); \
- }
+#include <axis2_utils.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/include/axis2_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_defines.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_defines.h (original)
+++ webservices/axis2/trunk/c/include/axis2_defines.h Wed May 17 21:20:02 2006
@@ -7,36 +7,13 @@
*/
#include <stddef.h>
+#include <axis2_utils_defines.h>
#ifdef __cplusplus
extern "C"
{
#endif
-/**
- * Type definitions
- */
- typedef char axis2_char_t;
- typedef int axis2_bool_t;
- typedef int axis2_status_t;
- typedef int axis2_scope_t;
- typedef unsigned int axis2_ssize_t;
- typedef char axis2_byte_t;
-
-#define AXIS2_CRLF_LENGTH 2
-
-/* These constant definitions should later be moved to platform dependant
- * files
- */
-
-#define AXIS2_EOLN '\0'
-
-/**
- * Boolean values
- */
-#define AXIS2_TRUE 1
-#define AXIS2_FALSE 0
-
/**
* This enum is used to decide the type of storage used
*/
@@ -46,114 +23,6 @@
AXIS2_XML_PARSER_TYPE_FILE,
AXIS2_XML_PARSER_TYPE_DOC
} axis2_xml_parser_type;
-
-/**
- * Exporting
- */
-#if defined(WIN32)
-#define AXIS2_EXPORT __declspec(dllexport)
-#else
-#define AXIS2_EXPORT
-#endif
-
-/**
- * Importing
- */
-#if defined(WIN32)
-#define AXIS2_IMPORT __declspec(dllimport)
-#else
-#define AXIS2_IMPORT
-#endif
-
-/**
- * Calling Conventions
- */
-#if defined(__GNUC__)
-#if defined(__i386)
-#define AXIS2_CALL __attribute__((cdecl))
-#else
-#define AXIS2_CALL
-#endif
-#else
-#if defined(__unix)
-#define AXIS2_CALL
-#else /* WIN32 */
-#define AXIS2_CALL __stdcall
-#endif
-#endif
-#define AXIS2_THREAD_FUNC AXIS2_CALL
-
-#ifdef DOXYGEN
-
-/* define these just so doxygen documents them */
-
-/**
- * AXIS2_DECLARE_STATIC is defined when including Axis2's Core headers,
- * to provide static linkage when the dynamic library may be unavailable.
- *
- * @see AXIS2_DECLARE_EXPORT
- *
- * AXIS2_DECLARE_STATIC and AXIS2_DECLARE_EXPORT are left undefined when
- * including Axis2's Core headers, to import and link the symbols from the
- * dynamic Axis2 Core library and assure appropriate indirection and calling
- * conventions at compile time.
- */
-# define AXIS2_DECLARE_STATIC
-/**
- * AXIS2_DECLARE_EXPORT is defined when building the Axis2 Core dynamic
- * library, so that all public symbols are exported.
- *
- * @see AXIS2_DECLARE_STATIC
- */
-# define AXIS2_DECLARE_EXPORT
-
-#endif /* def DOXYGEN */
-
-#if !defined(WIN32)
-/**
- * Axis2 Core functions are declared with AXIS2_DECLARE(), so they may
- * use the most appropriate calling convention. Other
- * Core functions with variable arguments must use AXIS2_DECLARE_NONSTD().
- * @code
- * AXIS2_DECLARE(rettype) axis2_func(args)
- * @endcode
- */
-#define AXIS2_DECLARE(type) type AXIS2_CALL
-
-/**
- * Axis2 Core variable argument and hook functions are declared with
- * AXIS2_DECLARE_NONSTD(), as they must use the C language calling convention.
- * @see AXIS2_DECLARE
- * @code
- * AXIS2_DECLARE_NONSTD(rettype) axis2_func(args [...])
- * @endcode
- */
-#define AXIS2_DECLARE_NONSTD(type) type
-
-/**
- * Axis2 Core variables are declared with AXIS2_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- *
- * @code
- * AXIS2_DECLARE_DATA type axis2_variable
- * @endcode
- */
-#define AXIS2_DECLARE_DATA
-
-#elif defined(AXIS2_DECLARE_STATIC)
-#define AXIS2_DECLARE(type) type AXIS2_CALL
-#define AXIS2_DECLARE_NONSTD(type) type
-#define AXIS2_DECLARE_DATA
-#elif defined(AXIS2_DECLARE_EXPORT)
-#define AXIS2_DECLARE(type) AXIS2_EXPORT type AXIS2_CALL
-#define AXIS2_DECLARE_NONSTD(type) AXIS2_EXPORT type
-#define AXIS2_DECLARE_DATA AXIS2_EXPORT
-#else
-#define AXIS2_DECLARE(type) AXIS2_IMPORT type AXIS2_CALL
-#define AXIS2_DECLARE_NONSTD(type) AXIS2_IMPORT type
-#define AXIS2_DECLARE_DATA AXIS2_IMPORT
-#endif
-
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_allocator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_allocator.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_allocator.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_allocator.h Wed May 17 21:20:02 2006
@@ -22,7 +22,7 @@
* @brief Axis2 memory allocator interface
*/
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#ifdef __cplusplus
extern "C"
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_class_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_class_loader.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_class_loader.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_class_loader.h Wed May 17 21:20:02 2006
@@ -22,10 +22,10 @@
* @brief axis2 class loader interface
*/
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_qname.h>
#include <axis2_error.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <axis2_dll_desc.h>
#include <axis2_svc_skeleton.h>
#include <axis2_param.h>
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_dir_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_dir_handler.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_dir_handler.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_dir_handler.h Wed May 17 21:20:02 2006
@@ -17,12 +17,12 @@
#ifndef AXIS2_DIR_HANDLER_H
#define AXIS2_DIR_HANDLER_H
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_error.h>
#include <axis2_env.h>
#include <axis2_string.h>
#include <axis2_array_list.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_dll_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_dll_desc.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_dll_desc.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_dll_desc.h Wed May 17 21:20:02 2006
@@ -22,10 +22,10 @@
* @brief Axis2 dll_desc interface
*/
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_qname.h>
#include <axis2_error.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <axis2_svc_skeleton.h>
#include <platforms/axis2_platform_auto_sense.h>
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_error.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_error.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_error.h Wed May 17 21:20:02 2006
@@ -17,7 +17,7 @@
#ifndef AXIS2_ERROR_H
#define AXIS2_ERROR_H
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_allocator.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_file.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_file.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_file.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_file.h Wed May 17 21:20:02 2006
@@ -17,10 +17,10 @@
#ifndef AXIS2_FILE_H
#define AXIS2_FILE_H
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_error.h>
#include <axis2_env.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <platforms/axis2_platform_auto_sense.h>
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_generic_obj.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_generic_obj.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_generic_obj.h Wed May 17 21:20:02 2006
@@ -17,10 +17,10 @@
#ifndef AXIS2_GENERIC_OBJ_H
#define AXIS2_GENERIC_OBJ_H
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_error.h>
#include <axis2_env.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_network_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_network_handler.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_network_handler.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_network_handler.h Wed May 17 21:20:02 2006
@@ -17,8 +17,8 @@
#ifndef AXIS2_NETWORK_HANDLER_H
#define AXIS2_NETWORK_HANDLER_H
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <sys/types.h>
#include <platforms/axis2_platform_auto_sense.h>
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_param_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_param_container.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_param_container.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_param_container.h Wed May 17 21:20:02 2006
@@ -22,9 +22,9 @@
* @brief Axis2 Param container interface
*/
-#include <axis2_const.h>
+#include <axis2_utils.h>
#include <axis2_error.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axis2_allocator.h>
#include <axis2_string.h>
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_property.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_property.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_property.h Wed May 17 21:20:02 2006
@@ -17,10 +17,10 @@
#ifndef AXIS2_PROPERTY_H
#define AXIS2_PROPERTY_H
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_error.h>
#include <axis2_env.h>
-#include <axis2_const.h>
+#include <axis2_utils.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_stream.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_stream.h Wed May 17 21:20:02 2006
@@ -17,8 +17,8 @@
#ifndef AXIS2_STREAM_H
#define AXIS2_STREAM_H
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <stdio.h>
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_thread_pool.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_thread_pool.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_thread_pool.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_thread_pool.h Wed May 17 21:20:02 2006
@@ -22,7 +22,7 @@
* @brief Axis2 thread pool interface
*/
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_allocator.h>
#include <axis2_thread.h>
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_url.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_url.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_url.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_url.h Wed May 17 21:20:02 2006
@@ -23,8 +23,8 @@
* @brief axis2 URL container implementation
*/
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_utils.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_utils.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_utils.h Wed May 17 21:20:02 2006
@@ -17,8 +17,7 @@
#ifndef AXIS2_UTILS_H
#define AXIS2_UTILS_H
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils_defines.h>
#include <axis2_error.h>
#include <axis2_env.h>
@@ -32,6 +31,71 @@
* @ingroup axis2_utils
* @{
*/
+
+/** This macro is called to check whether structure on which function is called
+ * is NULL and to check whether the environment structure passed is valid.
+ * @param object structure on which function is called
+ * @param env environment to be checked for validity
+ * @param error_return If function return a status it should pass here
+ * AXIS2_FAILURE. If function return a type pointer it should
+ * pass NULL
+ * @return If function return a status code return AXIS2_SUCCESS. Else if
+ * function return a type pointer return NULL
+ */
+#define AXIS2_FUNC_PARAM_CHECK(object, env, error_return) \
+ AXIS2_ENV_CHECK(env, error_return);\
+ if (!object) \
+ { \
+ AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM); \
+ AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE); \
+ return error_return; \
+ } \
+ else \
+ { \
+ AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_SUCCESS); \
+ }
+
+/**This macro is called to check whether an object is NULL.
+ * if object is NULL error number and status code is set
+ * @param object object to be check for NULL
+ * @param error_return If function return a status it should pass here
+ * AXIS2_FAILURE. If function return a type pointer it should
+ * pass NULL
+ * @return If function return a status code return AXIS2_SUCCESS. Else if
+ * function return a type pointer return NULL
+ */
+#define AXIS2_PARAM_CHECK(error, object, error_return) \
+ if (!object) \
+ { \
+ AXIS2_ERROR_SET_ERROR_NUMBER(error, AXIS2_ERROR_INVALID_NULL_PARAM); \
+ AXIS2_ERROR_SET_STATUS_CODE(error, AXIS2_FAILURE); \
+ return error_return; \
+ } \
+ else \
+ { \
+ AXIS2_ERROR_SET_STATUS_CODE(error, AXIS2_SUCCESS); \
+ }
+
+/**This macro is used to handle error situation.
+ * @param error_number Error number for the error occured
+ * @param error_return If function return a status it should pass here
+ * AXIS2_FAILURE. If function return a type pointer it should
+ * pass NULL
+ * @return If function return a status code return AXIS2_SUCCESS. Else if
+ * function return a type pointer return NULL
+ */
+#define AXIS2_ERROR_SET(error, error_number, status_code) \
+ { \
+ AXIS2_ERROR_SET_ERROR_NUMBER(error, error_number); \
+ AXIS2_ERROR_SET_STATUS_CODE(error, status_code); \
+ }
+
+
+
+
+
+
+
#define AXIS2_REQUEST_URL_PREFIX "/services"
/**
* This function allows users to reolve the service and op from the
Modified: webservices/axis2/trunk/c/modules/util/include/axis2_uuid_gen.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/axis2_uuid_gen.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/axis2_uuid_gen.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/axis2_uuid_gen.h Wed May 17 21:20:02 2006
@@ -17,8 +17,8 @@
#ifndef AXIS2_UUID_GEN_H
#define AXIS2_UUID_GEN_H
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <platforms/axis2_platform_auto_sense.h>
Modified: webservices/axis2/trunk/c/modules/util/include/platforms/unix/axis2_uuid_gen_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/util/include/platforms/unix/axis2_uuid_gen_unix.h?rev=407453&r1=407452&r2=407453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/include/platforms/unix/axis2_uuid_gen_unix.h (original)
+++ webservices/axis2/trunk/c/modules/util/include/platforms/unix/axis2_uuid_gen_unix.h Wed May 17 21:20:02 2006
@@ -17,8 +17,8 @@
#ifndef AXIS2_UUID_GEN_UNIX_H
#define AXIS2_UUID_GEN_UNIX_H
-#include <axis2_const.h>
-#include <axis2_defines.h>
+#include <axis2_utils.h>
+#include <axis2_utils_defines.h>
#define UUIDS_PER_TICK 100