# define S_IFMT (unsigned short)0xFFFF
# endif
-/*@constant observer char *INCLUDE_VAR@*/
-# define INCLUDE_VAR "include"
+# if defined (OS2) || defined (MSDOS) || defined (WIN32)
+/*@constant observer cstring INCLUDEPATH_VAR@*/
+# define INCLUDEPATH_VAR cstring_makeLiteralTemp ("INCLUDE")
+# else
+/*@constant observer cstring INCLUDEPATH_VAR@*/
+# define INCLUDEPATH_VAR cstring_makeLiteralTemp ("CPATH")
+# endif
#if defined (VMS)
-/* Connection string inserted between directory and filename to make a */
-/* full path name. */
+
+/*
+** VMS is here, but hasn't been tested for many releases. Not sure if this works.
+*/
+
+/*
+** Connection string inserted between directory and filename to make a
+** full path name.
+*/
# define CONNECTSTR ":"
# define CONNECTCHAR ':'
-
/* Directory separator character for search list. */
-/*@constant static char SEPCHAR; @*/
-# define SEPCHAR ':'
+/*@constant static char PATH_SEPARATOR; @*/
+# define PATH_SEPARATOR ':'
# elif defined(MSDOS) || defined(OS2) || defined(WIN32)
/* Directory separator character for search list. */
-/*@constant char SEPCHAR; @*/
-# define SEPCHAR ';'
+/*@constant char PATH_SEPARATOR; @*/
+# define PATH_SEPARATOR ';'
#else
/* Connection string inserted between directory and filename to make a */
# define CONNECTCHAR '/'
/* Directory separator character for search list. */
-/*@constant char SEPCHAR; @*/
-# define SEPCHAR ':'
+/*@constant char PATH_SEPARATOR; @*/
+# define PATH_SEPARATOR ':'
#endif
# else
# error "Multiple include"
# endif
+