wrowe 01/07/18 10:23:38
Modified: include apr_inherit.h
network_io/win32 sockets.c
Log:
apr_socket_[un]set_inherit is a noop on Win32, but must be exported.
Revision Changes Path
1.6 +2 -3 apr/include/apr_inherit.h
Index: apr_inherit.h
===================================================================
RCS file: /home/cvs/apr/include/apr_inherit.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_inherit.h 2001/07/16 20:49:56 1.5
+++ apr_inherit.h 2001/07/18 17:23:38 1.6
@@ -59,14 +59,13 @@
extern "C" {
#endif /* __cplusplus */
-#define APR_NO_INHERIT 0
#define APR_INHERIT (2^24) /* Outside of conflicts with other bits */
#define APR_DECLARE_SET_INHERIT(name) \
- void apr_##name##_set_inherit(apr_##name##_t *name)
+ APR_DECLARE(void) apr_##name##_set_inherit(apr_##name##_t *name)
#define APR_DECLARE_UNSET_INHERIT(name) \
- void apr_##name##_unset_inherit(apr_##name##_t *name)
+ APR_DECLARE(void) apr_##name##_unset_inherit(apr_##name##_t *name)
#ifdef __cplusplus
}
1.63 +8 -0 apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sockets.c 2001/07/18 16:51:48 1.62
+++ sockets.c 2001/07/18 17:23:38 1.63
@@ -410,3 +410,11 @@
(*sock)->sock = *thesock;
return APR_SUCCESS;
}
+
+APR_DECLARE_SET_INHERIT(socket) {
+ return;
+}
+
+APR_DECLARE_UNSET_INHERIT(socket) {
+ return;
+}
\ No newline at end of file
