diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:26:04 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:26:04 +0000 |
commit | 0be712bdc8083a1d206f0d508f3072e4fe44b965 (patch) | |
tree | 70d59dd6d5781487e0bfbbbfc4b41b0d51fc37d9 /dmake/winnt | |
parent | 1665dd3cfbea99ff5da8c682e1a35d46d38bcf9d (diff) |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/22 04:22:30 vq 1.1.1.1.132.2: Issue number: 47866
Submitted by: shay@openoffice.org, vq@openoffice.org
Fix MSVC compiler warnings.
2005/04/22 01:04:36 vq 1.1.1.1.132.1: #i47851# Increase the version number to 4.4-cvs and slightly rearrange the
output of "dmake -V".
Remove the hardcoded (in autotools builds) OS macro. It had the wrong value
to be usable with the startup/*.mk and is not mentioned in the man page.
Clean up configure.in and friends.
Diffstat (limited to 'dmake/winnt')
-rw-r--r-- | dmake/winnt/microsft/config.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/dmake/winnt/microsft/config.h b/dmake/winnt/microsft/config.h index 9ecc029a51ef..badb0147e76d 100644 --- a/dmake/winnt/microsft/config.h +++ b/dmake/winnt/microsft/config.h @@ -1,4 +1,4 @@ -/* RCS $Id: config.h,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $ +/* RCS $Id: config.h,v 1.2 2006-04-20 12:26:04 hr Exp $ -- -- SYNOPSIS -- Configurarion include file. @@ -25,6 +25,11 @@ -- Use cvs log to obtain detailed change logs. */ +/* Name and version number of this package */ +#define PACKAGE "dmake" +#define VERSION "4.4-cvs" +#define BUILDINFO "Windows / MS Visual C++" + #if defined (_MSC_VER) # if _MSC_VER < 500 Force a compile-time blowup. @@ -63,8 +68,10 @@ # define SIGQUIT SIGTERM #endif -/* MSC doesn't seem to care about CONST */ -#define CONST +/* MSC didn't seem to care about CONST in the past */ +#ifndef CONST +# define CONST +#endif #ifndef MSDOS # define MSDOS 1 |