Skip to content

Commit 72edc11

Browse files
committed
add VC version to -V
I didn't realize dmstr2 existed when I created STRINGIFY and DM_StGiFy, so remove my API names in favor dmake's older (and more authoritative) names.
1 parent 9ac59e5 commit 72edc11

5 files changed

Lines changed: 8 additions & 10 deletions

File tree

dmake.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,5 +228,10 @@
228228
#define STOBOOL(A) (A && ((*A | 0x20) == 'y'))
229229
#define BTOBOOL(A) (A)
230230

231+
/* To stringify the result of the expansion of a macro argument
232+
* use two levels of macros. */
233+
#define dmstr2(s) dmstr1(s)
234+
#define dmstr1(s) #s
235+
231236
#endif
232237

imacs.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828

2929
#include "extern.h"
3030

31-
#define DM_StGiFy(a) #a
32-
#define STRINGIFY(a) DM_StGiFy(a)
33-
#define SET_INT_VAR_FROM_INT(name, val, flag, var) _set_int_var_from_int_and_str(name, val, STRINGIFY(val), flag, var)
31+
#define SET_INT_VAR_FROM_INT(name, val, flag, var) _set_int_var_from_int_and_str(name, val, dmstr2(val), flag, var)
3432

3533
static void _set_int_var ANSI((char *, char *, int, int *));
3634
static void _set_int_var_from_int_and_str ANSI((char *, int, char *, int, int *));

win95/microsft/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/* Name and version number of this package */
3838
#define PACKAGE "dmake"
3939
#define VERSION "4.13"
40-
#define BUILDINFO "Windows / MS Visual C++"
40+
#define BUILDINFO "Windows / MS Visual C++ " dmstr2(_MSC_FULL_VER)
4141

4242
#if defined (_MSC_VER)
4343
# if _MSC_VER < 500

win95/microsft/ruletab.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
#define MAXIMUM_WAIT_OBJECTS 1
3636
#endif
3737

38-
/* To stringify the result of the expansion of a macro argument
39-
* use two levels of macros. */
40-
#define dmstr2(s) dmstr1(s)
41-
#define dmstr1(s) #s
42-
4338
static char *_rules[] = {
4439
"MAXLINELENGTH := 32766",
4540
"MAXPROCESSLIMIT := " dmstr2(MAXIMUM_WAIT_OBJECTS) ,

winnt/microsft/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/* Name and version number of this package */
2929
#define PACKAGE "dmake"
3030
#define VERSION "4.12"
31-
#define BUILDINFO "Windows / MS Visual C++"
31+
#define BUILDINFO "Windows / MS Visual C++" dmstr2(_MSC_FULL_VER)
3232

3333
#if defined (_MSC_VER)
3434
# if _MSC_VER < 500

0 commit comments

Comments
 (0)