Merge branch 'es/close'

diff --git a/src/mans/ping_iterator_get.pod b/src/mans/ping_iterator_get.pod
index ae73539..b9361b2 100644 (file)
--- a/src/mans/ping_iterator_get.pod
+++ b/src/mans/ping_iterator_get.pod
@@ -43,3 +43,8 @@ L<ping_iterator_get_context(3)>,
 L<liboping(3)>
 
 =head1 AUTHOR
+
+liboping is written by Florian octo Forster E<lt>octo at verplant.orgE<gt>.
+It's homepage can be found at L<http://verplant.org/liboping/>.
+
+(c) 2005, 2006 by Florian octo Forster.

diff --git a/src/oping.h b/src/oping.h
index 061aa5d..b17e659 100644 (file)
--- a/src/oping.h
+++ b/src/oping.h
@@ -30,10 +30,17 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #if HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Type definitions
  */
@@ -87,4 +94,8 @@ const char *ping_get_error (pingobj_t *obj);
 void *ping_iterator_get_context (pingobj_iter_t *iter);
 void  ping_iterator_set_context (pingobj_iter_t *iter, void *context);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* OCTO_PING_H */