Hi Gregg,
On Monday 07 June 2010, Gregg L. Smith wrote:
> This seems to break trunk on Windows, prior revision builds fine.
I am not really familiar with the difference between AP_DECLARE_DATA
and AP_MODULE_DECLARE_DATA or any other Windows build pecularities.
Maybe the attached patch helps?
Cheers,
Stefan
diff --git a/include/http_config.h b/include/http_config.h
index 92c0812..4f08add 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -402,6 +402,10 @@ struct module_struct {
extern module AP_MODULE_DECLARE_DATA foo##_module; \
static int * const aplog_module_index = &(foo##_module.module_index)
+#define APLOG_USE_MODULE_CORE \
+ extern module AP_DECLARE_DATA core_module; \
+ static int * const aplog_module_index = &(core_module.module_index)
+
#define AP_DECLARE_MODULE(foo) \
APLOG_USE_MODULE(foo); \
module AP_MODULE_DECLARE_DATA foo##_module
diff --git a/os/bs2000/os.c b/os/bs2000/os.c
index d75ecb3..20afd68 100644
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -30,7 +30,7 @@
#define USER_LEN 8
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
typedef enum
{
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 6e2f4f9..58a4d3a 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -52,7 +52,7 @@
unixd_config_rec ap_unixd_config;
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
const char *arg,
diff --git a/server/config.c b/server/config.c
index 085d339..ce59a17 100644
--- a/server/config.c
+++ b/server/config.c
@@ -51,7 +51,7 @@
#include "util_cfgtree.h"
#define APLOG_UNSET (APLOG_NO_MODULE - 1)
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
AP_DECLARE_DATA const char *ap_server_argv0 = NULL;
AP_DECLARE_DATA const char *ap_server_root = NULL;
diff --git a/server/core.c b/server/core.c
index c990175..f75ae1c 100644
--- a/server/core.c
+++ b/server/core.c
@@ -4051,7 +4051,8 @@ static void register_hooks(apr_pool_t *p)
NULL, AP_FTYPE_RESOURCE - 10);
}
-AP_DECLARE_MODULE(core) = {
+APLOG_USE_MODULE_CORE;
+AP_DECLARE_DATA module core_module = {
MPM20_MODULE_STUFF,
AP_PLATFORM_REWRITE_ARGS_HOOK, /* hook to run before apache parses args */
create_core_dir_config, /* create per-directory config structure */
diff --git a/server/core_filters.c b/server/core_filters.c
index 3c97400..93bf0cc 100644
--- a/server/core_filters.c
+++ b/server/core_filters.c
@@ -75,7 +75,7 @@ do { \
} while (!APR_BRIGADE_EMPTY(b) && (e != APR_BRIGADE_SENTINEL(b))); \
} while (0)
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
ap_input_mode_t mode, apr_read_type_e block,
diff --git a/server/listen.c b/server/listen.c
index 1002980..563a4dc 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -28,7 +28,7 @@
#include "http_log.h"
#include "mpm_common.h"
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
AP_DECLARE_DATA ap_listen_rec *ap_listeners = NULL;
diff --git a/server/log.c b/server/log.c
index 2ed087d..112ff6c 100644
--- a/server/log.c
+++ b/server/log.c
@@ -50,7 +50,7 @@
#include "util_time.h"
#include "ap_mpm.h"
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
typedef struct {
const char *t_name;
diff --git a/server/main.c b/server/main.c
index eee621f..803035e 100644
--- a/server/main.c
+++ b/server/main.c
@@ -45,7 +45,7 @@
#include <unistd.h>
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
/* WARNING: Win32 binds http_main.c dynamically to the server. Please place
* extern functions and global data in another appropriate module.
diff --git a/server/mpm_common.c b/server/mpm_common.c
index 3f80625..25847be 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -56,7 +56,7 @@
#include <unistd.h>
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
#if AP_ENABLE_EXCEPTION_HOOK
APR_HOOK_STRUCT(
diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index a9cde5c..0723828 100644
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -56,7 +56,7 @@
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
typedef enum {DO_NOTHING, SEND_SIGTERM, SEND_SIGKILL, GIVEUP} action_t;
diff --git a/server/protocol.c b/server/protocol.c
index 4a5cce2..5808d16 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -57,7 +57,7 @@
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
APR_HOOK_STRUCT(
APR_HOOK_LINK(post_read_request)
diff --git a/server/request.c b/server/request.c
index 9a9b975..6102244 100644
--- a/server/request.c
+++ b/server/request.c
@@ -54,7 +54,7 @@
#include <stdarg.h>
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
APR_HOOK_STRUCT(
APR_HOOK_LINK(translate_name)
diff --git a/server/scoreboard.c b/server/scoreboard.c
index 2bd9114..0cf36c3 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -36,7 +36,7 @@
#include "scoreboard.h"
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL;
AP_DECLARE_DATA const char *ap_scoreboard_fname = NULL;
diff --git a/server/util.c b/server/util.c
index 450fb54..eb1a008 100644
--- a/server/util.c
+++ b/server/util.c
@@ -80,7 +80,7 @@
#define IS_SLASH(s) (s == '/')
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
/*
diff --git a/server/util_cookies.c b/server/util_cookies.c
index 2904d07..d33013c 100644
--- a/server/util_cookies.c
+++ b/server/util_cookies.c
@@ -21,7 +21,7 @@
#define LOG_PREFIX "ap_cookie: "
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
/**
* Write an RFC2109 compliant cookie.
diff --git a/server/util_ebcdic.c b/server/util_ebcdic.c
index dbcdfd4..3b1791f 100644
--- a/server/util_ebcdic.c
+++ b/server/util_ebcdic.c
@@ -24,7 +24,7 @@
#include "http_core.h"
#include "util_ebcdic.h"
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
apr_status_t ap_init_ebcdic(apr_pool_t *pool)
{
diff --git a/server/util_expr.c b/server/util_expr.c
index 921b90b..1676613 100644
--- a/server/util_expr.c
+++ b/server/util_expr.c
@@ -28,7 +28,7 @@
#include "ap_expr.h"
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
#if 1
/*
diff --git a/server/util_filter.c b/server/util_filter.c
index 1446dd5..ac35b7a 100644
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -44,7 +44,7 @@
* filter names to filters
*/
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
typedef struct filter_trie_node filter_trie_node;
diff --git a/server/util_mutex.c b/server/util_mutex.c
index ad3833b..12b7e21 100644
--- a/server/util_mutex.c
+++ b/server/util_mutex.c
@@ -41,7 +41,7 @@
#include <unistd.h> /* getpid() */
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
AP_DECLARE(apr_status_t) ap_parse_mutex(const char *arg, apr_pool_t *pool,
apr_lockmech_e *mutexmech,
diff --git a/server/util_script.c b/server/util_script.c
index b518f62..e5d7406 100644
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -52,7 +52,7 @@
#define MALFORMED_MESSAGE "malformed header from script. Bad header="
#define MALFORMED_HEADER_LENGTH_TO_SHOW 30
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
static char *http2env(apr_pool_t *a, const char *w)
{
diff --git a/server/util_xml.c b/server/util_xml.c
index ebccee7..d59740a 100644
--- a/server/util_xml.c
+++ b/server/util_xml.c
@@ -29,7 +29,7 @@
#define READ_BLOCKSIZE 2048
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
AP_DECLARE(int) ap_xml_parse_input(request_rec * r, apr_xml_doc **pdoc)
{
diff --git a/server/vhost.c b/server/vhost.c
index 4b3855c..0567654 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -39,7 +39,7 @@
#include <arpa/inet.h>
#endif
-APLOG_USE_MODULE(core);
+APLOG_USE_MODULE_CORE;
/*
* After all the definitions there's an explanation of how it's all put
