# define S_IFMT (unsigned short)0xFFFF
# endif
-/*@constant observer char *INCLUDE_VAR@*/
-# define INCLUDE_VAR "include"
+/*@constant observer cstring INCLUDEPATH_VAR@*/
+# define INCLUDEPATH_VAR cstring_makeLiteralTemp ("CPATH")
#if defined (VMS)
/* Connection string inserted between directory and filename to make a */
/* 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