XML update.

[apache] / include / apreq.h

diff --git a/include/apreq.h b/include/apreq.h
index 2d1ba5eba0f0b43d249fe1821e5f7c5d854bb3a8..9faebdb0b776b9a2f4aaf6b2ddb379db1aaa999d 100644 (file)
--- a/include/apreq.h
+++ b/include/apreq.h
@@ -22,6 +22,7 @@
 #include <assert.h>
 #endif
 
+#include "ap_config.h"
 #include "apr_tables.h"
 #include <stddef.h>
 
@@ -34,55 +35,9 @@
  * @brief Main header file...
  * @ingroup libapreq2
  *
- * Define the generic APREQ_ macros and common data structures.
+ * Define the common data structures.
  */
 
-#ifndef WIN32
-/**
- * The public APREQ functions are declared with APREQ_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @remark Both the declaration and implementations must use the same macro.
- */
-/** APREQ_DECLARE(rettype) apeq_func(args)
- */
-#define APREQ_DECLARE(d)                APR_DECLARE(d)
-/**
- * The public APEQ functions using variable arguments are declared with 
- * APEQ_DECLARE_NONSTD(), as they must follow the C language calling convention.
- * @see APEQ_DECLARE @see APEQ_DECLARE_DATA
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APEQ_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APREQ_DECLARE_NONSTD(d)         APR_DECLARE_NONSTD(d)
-/**
- * The public APREQ variables are declared with APREQ_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- * @see APREQ_DECLARE @see APREQ_DECLARE_NONSTD
- * @remark Note that the declaration and implementations use different forms,
- * but both must include the macro.
- */
-/** extern APREQ_DECLARE_DATA type apr_variable;\n
- * APREQ_DECLARE_DATA type apr_variable = value;
- */
-#define APREQ_DECLARE_DATA
-#elif defined (APREQ_DECLARE_STATIC)
-#define APREQ_DECLARE(type)             type __stdcall
-#define APREQ_DECLARE_NONSTD(type)      type
-#define APREQ_DECLARE_DATA
-#elif defined (APREQ_DECLARE_EXPORT)
-#define APREQ_DECLARE(type)             __declspec(dllexport) type __stdcall
-#define APREQ_DECLARE_NONSTD(type)      __declspec(dllexport) type
-#define APREQ_DECLARE_DATA              __declspec(dllexport)
-#else
-#define APREQ_DECLARE(type)             __declspec(dllimport) type __stdcall
-#define APREQ_DECLARE_NONSTD(type)      __declspec(dllimport) type
-#define APREQ_DECLARE_DATA              __declspec(dllimport)
-#endif
-
 /**
  * Read chucks of data in 64k blocks from the request 
  */