summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/config.h.in6
-rw-r--r--win32/win32.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/win32/config.h.in b/win32/config.h.in
index 6bffe7eea4..0f017e9ac2 100644
--- a/win32/config.h.in
+++ b/win32/config.h.in
@@ -1,8 +1,10 @@
#define HAVE_PROTOTYPES 1
#define HAVE_STDARG_PROTOTYPES 1
/* #define HAVE_ATTR_NORETURN 1 */
-#define HAVE_INLINE 1
-#define INLINE __inline
+#if _MSC_VER > 1100 && !defined NORETURN
+#define NORETURN(x) __declspec(noreturn) x
+#endif
+#define inline __inline
/* #define HAVE_DIRENT_H 1 */
/* #define HAVE_UNISTD_H 1 */
#define HAVE_STDLIB_H 1
diff --git a/win32/win32.h b/win32/win32.h
index b6824528df..ebffc5c8ab 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -16,10 +16,6 @@
#define EXTERN extern __declspec(dllexport)
#endif
-#if defined _MSC_VER && !defined NORETURN
-#define NORETURN(x) __declspec(noreturn) x
-#endif
-
//
// Definitions for NT port of Perl
//