From: Garrett Rooney <rooneg@apache.org>
Date: Wed, 20 Sep 2006 15:04:38 +0000 (+0000)
Subject: * modules/cache/mod_cache.h
X-Git-Tag: 2.3.0~2129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=687acd285a399a24569eaff9853dce5a7ecc27f5;p=apache

* modules/cache/mod_cache.h
  (CACHE_DECLARE, CACHE_DECLARE_NONSTD, CACHE_DECLARE_DATA): Remove
   duplicate defines.

Submitted by: Davi Arnaut <davi@haxent.com.br>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@448226 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/cache/mod_cache.h b/modules/cache/mod_cache.h
index d2782e6559..0a62efbb5b 100644
--- a/modules/cache/mod_cache.h
+++ b/modules/cache/mod_cache.h
@@ -312,27 +312,6 @@ apr_status_t cache_recall_entity_body(cache_handle_t *h, apr_pool_t *p, apr_buck
 
 /* hooks */
 
-/* Create a set of CACHE_DECLARE(type), CACHE_DECLARE_NONSTD(type) and 
- * CACHE_DECLARE_DATA with appropriate export and import tags for the platform
- */
-#if !defined(WIN32)
-#define CACHE_DECLARE(type)            type
-#define CACHE_DECLARE_NONSTD(type)     type
-#define CACHE_DECLARE_DATA
-#elif defined(CACHE_DECLARE_STATIC)
-#define CACHE_DECLARE(type)            type __stdcall
-#define CACHE_DECLARE_NONSTD(type)     type
-#define CACHE_DECLARE_DATA
-#elif defined(CACHE_DECLARE_EXPORT)
-#define CACHE_DECLARE(type)            __declspec(dllexport) type __stdcall
-#define CACHE_DECLARE_NONSTD(type)     __declspec(dllexport) type
-#define CACHE_DECLARE_DATA             __declspec(dllexport)
-#else
-#define CACHE_DECLARE(type)            __declspec(dllimport) type __stdcall
-#define CACHE_DECLARE_NONSTD(type)     __declspec(dllimport) type
-#define CACHE_DECLARE_DATA             __declspec(dllimport)
-#endif
-
 APR_DECLARE_OPTIONAL_FN(apr_status_t, 
                         ap_cache_generate_key, 
                         (request_rec *r, apr_pool_t*p, char**key ));