1 files changed, 39 insertions, 6 deletions
diff --git a/ace/os_include/string.h b/ace/os_include/string.h
index baed3f80654..3f64068897b 100644
--- a/ace/os_include/string.h
+++ b/ace/os_include/string.h
@@ -2,19 +2,19 @@
 
 //=============================================================================
 /**
- *  @file    string.h
+ *  @file    os_string.h
  *
  *  string operations
  *
  *  $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_STRING_H
-#define ACE_OS_INCLUDE_STRING_H
+#ifndef ACE_OS_INCLUDE_OS_STRING_H
+#define ACE_OS_INCLUDE_OS_STRING_H
 
 #include "ace/pre.h"
 
@@ -27,8 +27,41 @@
 #include "ace/os_include/stddef.h"
 
 #if !defined (ACE_LACKS_STRING_H)
-# include /**/ <string.h>
+#  include /**/ <string.h>
 #endif /* !ACE_LACKS_STRING_H */
 
+// Place all additions (especially function declarations) within extern "C" {}
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+#if defined (ACE_LACKS_STRTOK_R_PROTOTYPE) && !defined (_POSIX_SOURCE)
+  char *strtok_r (char *s, const char *delim, char **save_ptr);
+#endif  /* ACE_LACKS_STRTOK_R_PROTOTYPE */
+
+#if defined (__BORLANDC__)
+#  define _stricmp stricmp
+#  define _strnicmp strnicmp
+#endif /* __BORLANDC__ */
+
+#if defined (ACE_HAS_CHARPTR_SPRINTF)
+#  define ACE_SPRINTF_ADAPTER(X) ::strlen (X)
+#else
+#  define ACE_SPRINTF_ADAPTER(X) X
+#endif /* ACE_HAS_CHARPTR_SPRINTF */
+
+#if defined (ACE_PSOS_SNARFS_HEADER_INFO)
+   // Header information snarfed from compiler provided header files
+   // that are not included because there is already an identically
+   // named file provided with pSOS, which does not have this info
+   // from compiler supplied header
+   char *strdup (const char *);  // string.h
+#endif /* ACE_PSOS_SNARFS_HEADER_INFO */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #include "ace/post.h"
-#endif /* ACE_OS_INCLUDE_STRING_H */
+#endif /* ACE_OS_INCLUDE_OS_STRING_H */