1 files changed, 15 insertions, 5 deletions
diff --git a/ace/os_include/regex.h b/ace/os_include/regex.h
index 410c61a5aa1..43c3b3534fb 100644
--- a/ace/os_include/regex.h
+++ b/ace/os_include/regex.h
@@ -2,19 +2,19 @@
 
 //=============================================================================
 /**
- *  @file    regex.h
+ *  @file    os_regex.h
  *
  *  regular expression matching 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_REGEX_H
-#define ACE_OS_INCLUDE_REGEX_H
+#ifndef ACE_OS_INCLUDE_OS_REGEX_H
+#define ACE_OS_INCLUDE_OS_REGEX_H
 
 #include "ace/pre.h"
 
@@ -30,5 +30,15 @@
 # include /**/ <regex.h>
 #endif /* !ACE_LACKS_REGEX_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_REGEX_H */
+#endif /* ACE_OS_INCLUDE_OS_REGEX_H */