carbon2-commit: fix compile problems under Visual Studio 6

[Ben Wing]

changeset:   4922:db9f7328bee1
parent:      4909:1f3ed6288996
user:        Ben Wing <ben at xemacs.org>
date:        Fri Jan 15 04:41:21 2010 -0600
files:       src/ChangeLog src/syswindows.h
description:
fix compile problems under Visual Studio 6

-------------------- ChangeLog entries follow: --------------------

src/ChangeLog addition:

2010-01-15  Ben Wing  <ben at xemacs.org>

	* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
	* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
	* syswindows.h (INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT):
	Declare some temporary pointer variables const to avoid compile
	errors under C++ and/or Visual Studio 6.


diff -r 1f3ed6288996 -r db9f7328bee1 src/ChangeLog
--- a/src/ChangeLog	Thu Jan 14 06:08:55 2010 -0600
+++ b/src/ChangeLog	Fri Jan 15 04:41:21 2010 -0600
@@ -1,3 +1,11 @@
+2010-01-15  Ben Wing  <ben at xemacs.org>
+
+	* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
+	* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
+	* syswindows.h (INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT):
+	Declare some temporary pointer variables const to avoid compile
+	errors under C++ and/or Visual Studio 6.
+
 2010-01-14  Ben Wing  <ben at xemacs.org>
 
 	* buffer.h:
diff -r 1f3ed6288996 -r db9f7328bee1 src/syswindows.h
--- a/src/syswindows.h	Thu Jan 14 06:08:55 2010 -0600
+++ b/src/syswindows.h	Fri Jan 15 04:41:21 2010 -0600
@@ -977,14 +977,14 @@
 #else /* not HAVE_CYGWIN_CONV_PATH */
 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out)		\
 do {							\
-  Ibyte *lfftt;						\
+  const Ibyte *lfftt;					\
 							\
   LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (path, lfftt);	\
   PATHNAME_CONVERT_OUT_TSTR (lfftt, out);		\
 } while (0)
 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out)		\
 do {							\
-  Ibyte *ttlff;						\
+  const Ibyte *ttlff;					\
 							\
   TSTR_TO_C_STRING (path, ttlff);			\
   INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, out);	\
@@ -1012,7 +1012,7 @@
 #define LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN(path, pathout)	\
 do								\
   {								\
-    Extbyte *lfftiwp;						\
+    const Extbyte *lfftiwp;					\
 								\
     LOCAL_FILE_FORMAT_TO_TSTR (path, lfftiwp);			\
     TSTR_TO_C_STRING (lfftiwp, pathout);			\
@@ -1020,7 +1020,7 @@
 while (0)
 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout)	\
 do {								\
-  Extbyte *iwtlffp;						\
+  const Extbyte *iwtlffp;					\
   C_STRING_TO_TSTR (path, iwtlffp);				\
   TSTR_TO_LOCAL_FILE_FORMAT (iwtlffp, pathout);			\
 } while (0)
@@ -1034,7 +1034,7 @@
      get 7-bit ISO2022-encoded data.  We know that our internal format	\
      is ASCII-compatible, and so these functions will work fine with	\
      this data. */							\
-  Ibyte *lfftiwp = (path);						\
+  const Ibyte *lfftiwp = (path);					\
   if (isalpha (lfftiwp[0]) && (IS_DEVICE_SEP (lfftiwp[1])))		\
     pathout = lfftiwp;							\
   else									\
@@ -1047,7 +1047,7 @@
 } while (0)
 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout)		\
 do {									\
-  Ibyte *wtlff1 = (path);						\
+  const Ibyte *wtlff1 = (path);						\
   int wtlff2 =								\
     cygwin_win32_to_posix_path_list_buf_size ((char *) wtlff1);		\
   Ibyte *wtlff3 = alloca_ibytes (wtlff2);				\