This commit was generated by cvs2svn to compensate for changes in r1383,

[chise/xemacs-chise.git.1] / src / s / windowsnt.h

diff --git a/src/s/windowsnt.h b/src/s/windowsnt.h
index 594e93e..33d49a4 100644 (file)
--- a/src/s/windowsnt.h
+++ b/src/s/windowsnt.h
@@ -188,8 +188,8 @@ typedef int pid_t;
 /* subprocess calls that are emulated */
 #ifndef DONT_ENCAPSULATE
 #define spawnve sys_spawnve
-int spawnve (int mode, CONST char *cmdname, 
-            CONST char * CONST *argv, CONST char *CONST *envp);
+int spawnve (int mode, const char *cmdname, 
+            const char * const *argv, const char *const *envp);
 #endif
 
 /* IO calls that are emulated or shadowed */
@@ -304,3 +304,11 @@ gid_t getegid (void);
   #define _WIN32_WINNT 0x0400
  #endif
 #endif
+
+/* MSVC 6.0 has a mechanism to declare functions which never return */
+#if (_MSC_VER >= 1200)
+#define DOESNT_RETURN __declspec(noreturn) void
+#define DECLARE_DOESNT_RETURN(decl) __declspec(noreturn) extern void decl
+#define DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS(decl,str,idx) \
+          __declspec(noreturn) extern void decl PRINTF_ARGS(str,idx)
+#endif /* MSVC 6.0 */