[tcl-rivet] 03/05: assuring in any way a definition of C99 boolean datatype (bool)

[mx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mxmanghi pushed a commit to branch quattuor
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git

commit d2f783f0417a8653182da6f6f2c596f8bfaee0b7
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Wed Jan 16 22:28:36 2019 +0100

    assuring in any way a definition of C99 boolean datatype (bool)
---
 src/mod_rivet_ng/mod_rivet.c | 5 ++---
 src/mod_rivet_ng/mod_rivet.h | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mod_rivet_ng/mod_rivet.c b/src/mod_rivet_ng/mod_rivet.c
index 0c2dd75..f23f7ad 100644
--- a/src/mod_rivet_ng/mod_rivet.c
+++ b/src/mod_rivet_ng/mod_rivet.c
@@ -50,7 +50,6 @@
 #include <unistd.h>
 #endif /* RIVET_HAVE_UNISTD_H */
 
-#include "rivet_types.h"
 #include "mod_rivet.h"
 #include "apache_config.h"
 
@@ -107,6 +106,7 @@ Rivet_SeekMPMBridge (apr_pool_t* pool,server_rec* server)
     char*   mpm_worker_bridge  = "rivet_worker_mpm.so";
     char*   mpm_bridge_path;
     int     ap_mpm_result;
+
     rivet_server_conf* rsc = RIVET_SERVER_CONF( server->module_config );
 
     /* With the env variable RIVET_MPM_BRIDGE we have the chance to tell mod_rivet 
@@ -134,7 +134,7 @@ Rivet_SeekMPMBridge (apr_pool_t* pool,server_rec* server)
             mpm_bridge_path = apr_pstrdup(pool,rsc->mpm_bridge);
         }
         else
-        {   
+        {
             ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, server, 
                          MODNAME ": MPM bridge %s not found", rsc->mpm_bridge); 
             exit(1);   
@@ -168,7 +168,6 @@ Rivet_SeekMPMBridge (apr_pool_t* pool,server_rec* server)
             mpm_bridge_path = apr_pstrdup(pool,mpm_worker_bridge);
         }
         mpm_bridge_path = apr_pstrcat(pool,RIVET_DIR,"/mpm/",mpm_bridge_path,NULL);
-
     }
     return mpm_bridge_path;
 }
diff --git a/src/mod_rivet_ng/mod_rivet.h b/src/mod_rivet_ng/mod_rivet.h
index 8f8c476..b4c2a4c 100644
--- a/src/mod_rivet_ng/mod_rivet.h
+++ b/src/mod_rivet_ng/mod_rivet.h
@@ -35,6 +35,8 @@
 #include <rivet_config.h>
 #endif
 
+#include "rivet_types.h"
+
 /*
  * Petasis 16 Dec 2018: This causes the symbol to be exported also from MPMs...
 
@@ -183,6 +185,7 @@ typedef apr_status_t            (RivetBridge_Finalize)      (void*);
 typedef rivet_thread_interp*    (RivetBridge_Master_Interp) (void);
 typedef int                     (RivetBridge_Exit_Handler)  (int);
 typedef rivet_thread_interp*    (RivetBridge_Thread_Interp) (rivet_thread_private*,rivet_server_conf *,rivet_thread_interp*);
+typedef bool                    RivetBridge_InheritsInterps;
 
 typedef struct _mpm_bridge_table {
     RivetBridge_ServerInit    *server_init;
@@ -191,6 +194,7 @@ typedef struct _mpm_bridge_table {
     RivetBridge_Finalize      *child_finalize;
     RivetBridge_Exit_Handler  *exit_handler;
     RivetBridge_Thread_Interp *thread_interp;
+    RivetBridge_InheritsInterps inherits_interps;
 } rivet_bridge_table;
 
 /* we need also a place where to store globals with module wide scope */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org