Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support later Visual Studio releases better #1190

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support later Visual Studio releases better #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7712518
config.h.w32: Accomdate [stdint|inttypes].h
fanc999-1 Nov 1, 2023
e07f78b
NTMakefile: Correct stdint.h check and add stdbool.h check
fanc999-1 Nov 1, 2023
3c42640
windows/NTMakefile.w32: Honor MAKEINFO if specified
fanc999-1 Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions include/config.h.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,19 +577,23 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
/* #undef HAVE_INNETGR */

/* Define to 1 if the system has the type `int16_t'. */
/* #define HAVE_INT16_T 1 */
#if (_MSC_VER >= 1600)
#define HAVE_INT16_T 1

/* Define to 1 if the system has the type `int32_t'. */
/* #define HAVE_INT32_T 1 */
#define HAVE_INT32_T 1

/* Define to 1 if the system has the type `int64_t'. */
/* #define HAVE_INT64_T 1 */
#define HAVE_INT64_T 1

/* Define to 1 if the system has the type `int8_t'. */
/* #define HAVE_INT8_T 1 */
#define HAVE_INT8_T 1
#endif

/* Define to 1 if you have the <inttypes.h> header file. */
/* #define HAVE_INTTYPES_H 1 */
#if (_MSC_VER >= 1800)
#define HAVE_INTTYPES_H 1
#endif

/* Define to 1 if you have the <io.h> header file. */
#define HAVE_IO_H 1
Expand Down Expand Up @@ -844,7 +848,9 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
/* #undef HAVE_STANDARDS_H */

/* Define to 1 if you have the <stdint.h> header file. */
/* #define HAVE_STDINT_H 1 */
#if (_MSC_VER >= 1600)
#define HAVE_STDINT_H 1
#endif

/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
Expand Down Expand Up @@ -1116,17 +1122,19 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
/* Define to 1 if you have the <udb.h> header file. */
/* #undef HAVE_UDB_H */

#if (_MSC_VER >= 1600)
/* Define to 1 if the system has the type `uint16_t'. */
/* #define HAVE_UINT16_T 1 */
#define HAVE_UINT16_T 1

/* Define to 1 if the system has the type `uint32_t'. */
/* #define HAVE_UINT32_T 1 */
#define HAVE_UINT32_T 1

/* Define to 1 if the system has the type `uint64_t'. */
/* #define HAVE_UINT64_T 1 */
#define HAVE_UINT64_T 1

/* Define to 1 if the system has the type `uint8_t'. */
/* #define HAVE_UINT8_T 1 */
#define HAVE_UINT8_T 1
#endif

/* Define to 1 if the system has the type `uintptr_t'. */
#define HAVE_UINTPTR_T 1
Expand Down Expand Up @@ -1365,7 +1373,7 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
/* Define if getpwnam_r has POSIX flavour. */
/* #define POSIX_GETPWNAM_R 1 */

/* Define if getpwnam_r has POSIX flavour. */
/* Define if getpwuid_r has POSIX flavour. */
/* #define POSIX_GETPWUID_R 1 */

/* Define if you have the readline package. */
Expand Down
2 changes: 2 additions & 0 deletions lib/roken/NTMakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,9 @@ INCFILES = \
$(INCDIR)\roken-common.h \
$(INCDIR)\rtbl.h \
$(INCDIR)\search.h \
!ifndef HAVE_STDBOOL_H
$(INCDIR)\stdbool.h \
!endif
$(INCDIR)\syslog.h \
$(INCDIR)\vis.h \
$(INCDIR)\vis-extras.h \
Expand Down
5 changes: 4 additions & 1 deletion windows/NTMakefile.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
! include <windows\NTMakefile.version>
!endif

!if [ $(PERL) $(SRC)\cf\w32-detect-vc-version.pl $(CC) ]==16
!if [ $(PERL) $(SRC)\cf\w32-detect-vc-version.pl $(CC) ]>=16
HAVE_STDINT_H=1
HAVE_INT64_T=1
!if [ $(PERL) $(SRC)\cf\w32-detect-vc-version.pl $(CC) ]>=18
HAVE_STDBOOL_H=1
!endif
!endif


Expand Down
2 changes: 2 additions & 0 deletions windows/NTMakefile.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ PERL=perl.exe
CMP=cmp.exe
MAKECAT=makecat.exe
HHC=hhc.exe
!ifndef MAKEINFO
MAKEINFO=makeinfo.exe
!endif
SED=sed.exe

CANDLE_CMD=candle.exe
Expand Down
Loading