1 files changed, 24 insertions, 16 deletions

diff --git a/PACE/pace/posix/string.h b/PACE/pace/posix/string.h
index ff345ee7f28..0d21ae14185 100644
--- a/PACE/pace/posix/string.h
+++ b/PACE/pace/posix/string.h
@@ -22,105 +22,114 @@
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
-  /** 
+#if !defined (PACE_NULL)
+# define PACE_NULL NULL
+#endif /* NULL */
+
+#ifndef PACE_SIZE_T
+#define PACE_SIZE_T
+  typedef size_t pace_size_t;
+#endif /* PACE_SIZE_T */
+
+  /**
      PACE's implementation of the POSIX function strcat.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE char * pace_strcat (char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strncat.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE char * pace_strncat (char * s1, const char * s2, size_t n);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strchr.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE const char * pace_strchr (const char * s, int c);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strrchr.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE const char * pace_strrchr (const char * s, int c);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strcmp.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE int pace_strcmp (const char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strncmp.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE int pace_strncmp (const char * s1, const char * s2, size_t n);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strcpy.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE char * pace_strcpy (char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strncpy.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE char * pace_strncpy (char * s1, const char * s2, size_t n);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strcspn.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE size_t pace_strcspn (const char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strspn.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE size_t pace_strspn (const char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strlen.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE size_t pace_strlen (const char * s);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strpbrk.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE const char * pace_strpbrk (const char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strstr.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE const char * pace_strstr (const char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strtok.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.1.
    */
   PACE_INLINE char * pace_strtok (char * s1, const char * s2);
 
-  /** 
+  /**
      PACE's implementation of the POSIX function strtok_r.
      See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
      IEEE Std 1003.1, 1996 Edition), Section 8.3.3.
@@ -131,7 +140,6 @@ extern "C" {
   /* Requires PACE_HAS_REENTRANT. */
 
 
-
 #if defined (PACE_HAS_CPLUSPLUS)
 }
 #endif /* PACE_HAS_CPLUSPLUS */