* emacs.c (SEPCHAR): Instead of defining this to be ',' on VMS and

	':' elsewhere, just have it default to ':' if not #defined, and
	#define it to be ',' in s/vms.h; OS/2 will need it to be ';'.
	* s/vms.h (SEPCHAR): #define this to be ','.
	* s/template.h (SEPCHAR): Mention this.

	* s/vms.h (xfree): #define this to emacs_xfree, to avoid case
	conflict with XFree; on VMS, external symbols are case-insensitive.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/s/vms.h b/src/s/vms.h
index 8278cfbcfac..e2a9af5d9fe 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -250,3 +250,9 @@ globalref char sdata[];
 #define NULL_DEVICE "NLA0:"
 
 #define EXEC_SUFFIXES ".exe:.com"
+
+/* Case conflict with Xlib XFree () */
+#define xfree emacs_xfree
+
+/* What separator do we use in paths?  */
+#define SEPCHAR ','