1 files changed, 56 insertions, 10 deletions
diff --git a/PACE/pace/posix/string.h b/PACE/pace/posix/string.h
index f25fd8b077e..279e226b0aa 100644
--- a/PACE/pace/posix/string.h
+++ b/PACE/pace/posix/string.h
@@ -13,24 +13,70 @@
  *
  * ============================================================================ */
 
-#ifndef PACE_STRING_H_POSIX
-#define PACE_STRING_H_POSIX
+#ifndef PACE_STRING_H
+#define PACE_STRING_H
+
+#include "pace/unistd.h"
 
 #if defined (PACE_HAS_CPLUSPLUS)
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
-#if !defined (PACE_NULL)
-# define PACE_NULL NULL
-#endif /* NULL */
+  PACE_INLINE void * pace_memccpy (void * s1, const void * s2, int c, size_t n);
+
+  PACE_INLINE const void * pace_memchr (const void * s, int c, size_t n);
+
+  PACE_INLINE int pace_memcmp (const void * s1, const void * s2, size_t n);
+
+  PACE_INLINE void * pace_memcpy (void * s1, const void * s2, size_t n);
+
+  PACE_INLINE void * pace_memmove (void * s1, const void * s2, size_t n);
+
+  PACE_INLINE void * pace_memset (void * s, int c, size_t n);
+
+  PACE_INLINE char * pace_strcat (char * s1, const char * s2);
+
+  PACE_INLINE char * pace_strncat (char * s1, const char * s2, size_t n);
+
+  PACE_INLINE const char * pace_strchr (const char * s, int c);
+
+  PACE_INLINE const char * pace_strrchr (const char * s, int c);
+
+  PACE_INLINE int pace_strcmp (const char * s1, const char * s2);
+
+  PACE_INLINE int pace_strncmp (const char * s1, const char * s2, size_t n);
+
+  PACE_INLINE char * pace_strcpy (char * s1, const char * s2);
+
+  PACE_INLINE char * pace_strncpy (char * s1, const char * s2, size_t n);
+
+  PACE_INLINE size_t pace_strcspn (const char * s1, const char * s2);
+
+  PACE_INLINE size_t pace_strspn (const char * s1, const char * s2);
+
+  PACE_INLINE char * pace_strdup (const char * s1);
+
+  PACE_INLINE size_t pace_strlen (const char * s);
+
+  PACE_INLINE const char * pace_strpbrk (const char * s1, const char * s2);
+
+  PACE_INLINE const char * pace_strstr (const char * s1, const char * s2);
+
+  PACE_INLINE char * pace_strtok (char * s1, const char * s2);
+
+  PACE_INLINE char * pace_strtok_r (char * s,
+                                    const char * sep,
+                                    char ** lasts);
+  /* Requires PACE_HAS_REENTRANT. */
+
 
-#ifndef PACE_SIZE_T
-#define PACE_SIZE_T
-  typedef size_t pace_size_t;
-#endif /* PACE_SIZE_T */
 
 #if defined (PACE_HAS_CPLUSPLUS)
 }
 #endif /* PACE_HAS_CPLUSPLUS */
 
-#endif /* PACE_STRING_H_POSIX */
+#if defined (PACE_HAS_INLINE)
+# include "pace/posix/string.inl"
+#endif /* PACE_HAS_INLINE */
+
+#endif /* PACE_STRING_H */