msvc2019

adamyg · Dec 27, 2023 · aed343b · aed343b
1 parent 53dc2a5
commit aed343b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/.cvsignore b/.cvsignore
@@ -5,7 +5,7 @@ ref
 bin
 bin.*
 lib.*
-objects*
+obj.*
 Makefile
 buildinfo.h
 BUILDNUMBER

diff --git a/libNTService/Makefile.in b/libNTService/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.5 2022/03/17 03:44:19 cvsuser Exp $
+# $Id: Makefile.in,v 1.6 2023/12/27 14:22:58 cvsuser Exp $
 # libNTService makefile.
 #
 # Copyright (c) 2020 - 2023, Adam Young.

diff --git a/libNTService/NTService.cpp b/libNTService/NTService.cpp
@@ -1,5 +1,5 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTService_cpp, "$Id: NTService.cpp,v 1.13 2023/12/24 15:01:40 cvsuser Exp $")
+__CIDENT_RCSID(NTService_cpp, "$Id: NTService.cpp,v 1.14 2023/12/27 14:22:58 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*

diff --git a/libNTService/NTServiceConfig.cpp b/libNTService/NTServiceConfig.cpp
@@ -1,5 +1,5 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTServiceConfig_cpp, "$Id: NTServiceConfig.cpp,v 1.9 2023/12/24 15:01:40 cvsuser Exp $")
+__CIDENT_RCSID(NTServiceConfig_cpp, "$Id: NTServiceConfig.cpp,v 1.10 2023/12/27 14:22:58 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*

diff --git a/libNTService/NTServiceControl.cpp b/libNTService/NTServiceControl.cpp
@@ -1,5 +1,5 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTServiceControl_cpp, "$Id: NTServiceControl.cpp,v 1.7 2023/12/24 15:01:40 cvsuser Exp $")
+__CIDENT_RCSID(NTServiceControl_cpp, "$Id: NTServiceControl.cpp,v 1.8 2023/12/27 14:22:59 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*

diff --git a/libNTService/NTServiceReg.cpp b/libNTService/NTServiceReg.cpp
@@ -1,5 +1,5 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(NTServiceReg_cpp, "$Id: NTServiceReg.cpp,v 1.5 2023/12/24 15:01:40 cvsuser Exp $")
+__CIDENT_RCSID(NTServiceReg_cpp, "$Id: NTServiceReg.cpp,v 1.6 2023/12/27 14:22:59 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 8; -*- */
 /*

diff --git a/libw32/msvc/stdint.h b/libw32/msvc/stdint.h
@@ -1,5 +1,5 @@
-#ifndef GR_LIBW32_MSVC_STDINT_H_INCLUDED
-#define GR_LIBW32_MSVC_STDINT_H_INCLUDED
+#ifndef LIBW32_MSVC_STDINT_H_INCLUDED
+#define LIBW32_MSVC_STDINT_H_INCLUDED
 
 /* -*- mode: c; indent-width: 4; -*- */
 // ISO C9x compliant stdint.h for Microsoft Visual Studio
@@ -36,14 +36,11 @@
 #ifndef _MSC_VER
 #error "Use this header only with Microsoft Visual C++ compilers!"
 #endif
-#if _MSC_VER > 1000
+
+#if _MSC_VER > 1
 #pragma once
 #endif
 
-/*
- * ==end==
- */
-
 #include <limits.h>
 
 // For Visual Studio 6 in C++ mode and for many Visual Studio versions when
@@ -76,6 +73,7 @@ extern "C" {
 // realize that, e.g. char has the same size as __int8
 // so we give up on __intX for them.
 #if !defined(_MSC_STDINT_H_TYPES)
+#define _MSC_STDINT_H_TYPES
 #if (_MSC_VER < 1300)
 typedef signed char int8_t;
 typedef signed short int16_t;
@@ -93,7 +91,6 @@ typedef unsigned __int32 uint32_t;
 #endif /*1300*/
 typedef signed __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-#define _MSC_STDINT_H_TYPES
 #endif /*_MSC_STDINT_H_TYPES*/
 
 // 7.18.1.2 Minimum-width integer types
@@ -132,7 +129,8 @@ typedef uint64_t uintmax_t;
 
 // 7.18.2 Limits of specified-width integer types
 
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
+#if !defined(__cplusplus) || \
+ (_MSC_VER >= 1920) || defined(__STDC_LIMIT_MACROS) // [ C99, footnote 224 at page 260, removed C11
 
 // 7.18.2.1 Limits of exact-width integer types
 #define INT8_MIN ((int8_t)_I8_MIN)
@@ -229,7 +227,8 @@ typedef uint64_t uintmax_t;
 
 // 7.18.4 Limits of other integer types
 
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260
+#if !defined(__cplusplus) || \
+ (_MSC_VER >= 1920) || defined(__STDC_CONSTANT_MACROS) // [ C99, footnote 224 at page 260, removed C11
 
 // 7.18.4.1 Macros for minimum-width integer constants
 
@@ -244,9 +243,13 @@ typedef uint64_t uintmax_t;
 #define UINT64_C(val) val##ui64
 
 // 7.18.4.2 Macros for greatest-width integer constants
+#ifndef INTMAX_C
 #define INTMAX_C INT64_C
+#endif
+#ifndef UINTMAX_C
 #define UINTMAX_C UINT64_C
+#endif
 
 #endif // __STDC_CONSTANT_MACROS ]
 
-#endif /*GR_LIBW32_MSVC_STDINT_H_INCLUDED*/
+#endif /*LIBW32_MSVC_STDINT_H_INCLUDED*/