You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by mx...@apache.org on 2018/12/05 15:53:17 UTC
[tcl-rivet] 01/01: branching winbuild to work on the windows build
with more freedom
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch winbuild
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit 2e9b790ff8c1bdbbf5903c3a4227acfa610e1fcb
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Wed Dec 5 16:52:54 2018 +0100
branching winbuild to work on the windows build with more freedom
---
src/mod_rivet_ng/mod_rivet.c | 2 +-
src/mod_rivet_ng/mod_rivet.h | 6 ++++++
src/mod_rivet_ng/rivet_lazy_mpm.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/mod_rivet_ng/mod_rivet.c b/src/mod_rivet_ng/mod_rivet.c
index 6cb94a5..4ec8930 100644
--- a/src/mod_rivet_ng/mod_rivet.c
+++ b/src/mod_rivet_ng/mod_rivet.c
@@ -67,7 +67,7 @@
#include "mod_rivet_generator.h"
module AP_MODULE_DECLARE_DATA rivet_module;
-extern Tcl_ChannelType RivetChan;
+extern Tcl_ChannelType RivetChan;
DLLEXPORT apr_threadkey_t* rivet_thread_key = NULL;
DLLEXPORT mod_rivet_globals* module_globals = NULL;
diff --git a/src/mod_rivet_ng/mod_rivet.h b/src/mod_rivet_ng/mod_rivet.h
index 2767663..aa7ee52 100644
--- a/src/mod_rivet_ng/mod_rivet.h
+++ b/src/mod_rivet_ng/mod_rivet.h
@@ -322,4 +322,10 @@ Tcl_Obj* Rivet_CurrentServerRec (Tcl_Interp* interp, server_rec* s);
#define RIVET_MPM_BRIDGE_COMPOSE(bridge) RIVET_DIR,"/mpm/rivet_",bridge,"_mpm.so"
+#ifdef WIN32
+#define DLLIMPORT __declspec( dllimport )
+#else
+#define DLLIMPORT
+#endif
+
#endif /* MOD_RIVET_H */
diff --git a/src/mod_rivet_ng/rivet_lazy_mpm.c b/src/mod_rivet_ng/rivet_lazy_mpm.c
index d406f55..b3a57b0 100644
--- a/src/mod_rivet_ng/rivet_lazy_mpm.c
+++ b/src/mod_rivet_ng/rivet_lazy_mpm.c
@@ -38,7 +38,7 @@
extern DLLIMPORT mod_rivet_globals* module_globals;
extern DLLIMPORT apr_threadkey_t* rivet_thread_key;
-extern DLLIMPORT module rivet_module;
+extern DLLIMPORT module rivet_module;
enum
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org