summaryrefslogtreecommitdiff
path: root/ace/os_include/wordexp.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/os_include/wordexp.h')
-rw-r--r--ace/os_include/wordexp.h23
1 files changed, 16 insertions, 7 deletions
diff --git a/ace/os_include/wordexp.h b/ace/os_include/wordexp.h
index 1351c540f82..b46d5c7933c 100644
--- a/ace/os_include/wordexp.h
+++ b/ace/os_include/wordexp.h
@@ -2,19 +2,19 @@
//=============================================================================
/**
- * @file wordexp.h
+ * @file os_wordexp.h
*
* word-expansion types
*
* $Id$
*
- * @author Don Hinton <dhinton@ieee.org>
+ * @author Don Hinton <dhinton@dresystems.com>
* @author This code was originally in various places including ace/OS.h.
*/
//=============================================================================
-#ifndef ACE_OS_INCLUDE_WORDEXP_H
-#define ACE_OS_INCLUDE_WORDEXP_H
+#ifndef ACE_OS_INCLUDE_OS_WORDEXP_H
+#define ACE_OS_INCLUDE_OS_WORDEXP_H
#include "ace/pre.h"
@@ -24,12 +24,21 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-// @todo make sure that size_t is in stddef.h and sys/types.h includes stddef.h
#include "ace/os_include/stddef.h" // size_t
#if !defined (ACE_LACKS_WORDEXP_H)
-# include /**/ <wordexp.h>
+# include /**/ <wordexp.h>
#endif /* !ACE_LACKS_WORDEXP_H */
+// Place all additions (especially function declarations) within extern "C" {}
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#include "ace/post.h"
-#endif /* ACE_OS_INCLUDE_WORDEXP_H */
+#endif /* ACE_OS_INCLUDE_OS_WORDEXP_H */