From a00e288af730f68c4296368ecf8b413c6e569395 Mon Sep 17 00:00:00 2001
From: PHO <pho@cielonegro.org>
Date: Sun, 12 Sep 2010 00:15:14 +0900
Subject: [PATCH] bindings.apr.inherit.h

---
 Bindings/APR/Network/IO.hsc    |  8 +++++---
 Bindings/APR/Shm.hsc           |  3 ++-
 bindings-apr.cabal             |  2 ++
 include/bindings.apr.inherit.h | 15 +++++++++++++++
 include/bindings.apr.pools.h   | 10 ++++++++++
 include/bindings.apr.ring.h    |  1 +
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 include/bindings.apr.inherit.h
 create mode 100644 include/bindings.apr.pools.h

diff --git a/Bindings/APR/Network/IO.hsc b/Bindings/APR/Network/IO.hsc
index 90d0e5c..febaf5e 100644
--- a/Bindings/APR/Network/IO.hsc
+++ b/Bindings/APR/Network/IO.hsc
@@ -1,5 +1,7 @@
 #include <bindings.dsl.h>
 #include <apr_network_io.h>
+#include "bindings.apr.pools.h"
+#include "bindings.apr.inherit.h"
 
 module Bindings.APR.Network.IO where
 #strict_import
@@ -129,9 +131,9 @@ import Bindings.APR.Want
 
 #ccall apr_socket_protocol_get, Ptr <apr_socket_t> -> Ptr CInt -> IO <apr_status_t>
 
-#ccall apr_socket_pool_get     , Ptr <apr_socket_t> -> IO (Ptr <apr_pool_t>)
-#ccall apr_socket_inherit_set  , Ptr <apr_socket_t> -> IO <apr_status_t>
-#ccall apr_socket_inherit_unset, Ptr <apr_socket_t> -> IO <apr_status_t>
+#apr_pool_accessor socket
+#apr_inherit_set   socket
+#apr_inherit_unset socket
 
 #ccall apr_mcast_join     , Ptr <apr_socket_t> -> Ptr <apr_sockaddr_t> -> Ptr <apr_sockaddr_t> -> Ptr <apr_sockaddr_t> -> IO <apr_status_t>
 #ccall apr_mcast_leave    , Ptr <apr_socket_t> -> Ptr <apr_sockaddr_t> -> Ptr <apr_sockaddr_t> -> Ptr <apr_sockaddr_t> -> IO <apr_status_t>
diff --git a/Bindings/APR/Shm.hsc b/Bindings/APR/Shm.hsc
index cfd54c0..84bf37e 100644
--- a/Bindings/APR/Shm.hsc
+++ b/Bindings/APR/Shm.hsc
@@ -1,5 +1,6 @@
 #include <bindings.dsl.h>
 #include <apr_shm.h>
+#include "bindings.apr.pools.h"
 
 module Bindings.APR.Shm where
 #strict_import
@@ -17,4 +18,4 @@ import Bindings.APR.Pools
 #ccall apr_shm_baseaddr_get, Ptr <apr_shm_t> -> IO (Ptr ())
 #ccall apr_shm_size_get    , Ptr <apr_shm_t> -> IO <apr_size_t>
 
-#ccall apr_shm_pool_get    , Ptr <apr_shm_t> -> IO (Ptr <apr_pool_t>)
+#apr_pool_accessor shm
diff --git a/bindings-apr.cabal b/bindings-apr.cabal
index 6ea8408..4b18e60 100644
--- a/bindings-apr.cabal
+++ b/bindings-apr.cabal
@@ -83,6 +83,8 @@ Library
         include
 
     Install-Includes:
+        bindings.apr.inherit.h
+        bindings.apr.pools.h
         bindings.apr.ring.h
 
     Extensions:
diff --git a/include/bindings.apr.inherit.h b/include/bindings.apr.inherit.h
new file mode 100644
index 0000000..149be59
--- /dev/null
+++ b/include/bindings.apr.inherit.h
@@ -0,0 +1,15 @@
+#ifndef __BINDINGS_APR_INHERIT_H__
+#define __BINDINGS_APR_INHERIT_H__
+#include <bindings.dsl.h>
+
+#define hsc_apr_inherit_set(TYPE)                       \
+    hsc_ccall(                                          \
+        apr_ ## TYPE ## _inherit_set,                   \
+        Ptr <apr_ ## TYPE ## _t> -> IO <apr_status_t>)
+
+#define hsc_apr_inherit_unset(TYPE)                     \
+    hsc_ccall(                                          \
+        apr_ ## TYPE ## _inherit_unset,                 \
+        Ptr <apr_ ## TYPE ## _t> -> IO <apr_status_t>)
+
+#endif
diff --git a/include/bindings.apr.pools.h b/include/bindings.apr.pools.h
new file mode 100644
index 0000000..34ca651
--- /dev/null
+++ b/include/bindings.apr.pools.h
@@ -0,0 +1,10 @@
+#ifndef __BINDINGS_APR_POOLS_H__
+#define __BINDINGS_APR_POOLS_H__
+#include <bindings.dsl.h>
+
+#define hsc_apr_pool_accessor(TYPE)                        \
+    hsc_ccall(                                             \
+        apr_ ## TYPE ## _pool_get,                         \
+        Ptr <apr_ ## TYPE ## _t> -> IO (Ptr <apr_pool_t>))
+
+#endif
diff --git a/include/bindings.apr.ring.h b/include/bindings.apr.ring.h
index 73dfa35..e4c9f7d 100644
--- a/include/bindings.apr.ring.h
+++ b/include/bindings.apr.ring.h
@@ -1,5 +1,6 @@
 #ifndef __BINDINGS_APR_RING_H__
 #define __BINDINGS_APR_RING_H__
+#include <bindings.dsl.h>
 
 #define hsc_apr_ring_entry_field(NAME, TYPE)    \
     hsc_field(NAME.next, Ptr TYPE)              \
-- 
2.40.0