diff options
| author | Richard Kistruck | 2006-06-29 17:55:13 +0100 |
|---|---|---|
| committer | Richard Kistruck | 2006-06-29 17:55:13 +0100 |
| commit | b992fba80ccffa9a34259fffa570ee603c683117 (patch) | |
| tree | 3ffab47826a459a5e5eaa81144e6497e8475f822 /mps/code/testlib.c | |
| parent | 77b549a933a7ac2132d5e5a3d9604d2f22518e5e (diff) | |
| parent | 8fffb7e63af2e57b2c92e033187eed3ad5d68970 (diff) | |
| download | emacs-b992fba80ccffa9a34259fffa570ee603c683117.tar.gz emacs-b992fba80ccffa9a34259fffa570ee603c683117.zip | |
Mps: fix w3 builds: integrate from master the following:
MPS: fix Windows build of text-executables needing formats, with new
make-variable FMTTEST, replacing DWTEST and HETEST, and fixing
awlut.exe build. (integrate from version/1.106/...@157962)
(159467)
MPS: fix w3i3mv "all" build with VC6:
1. amsss.c: initialize ambigRoot (uninitialized warning);
2. commpost.nmk:
2a. drop long-vanished protcv.exe;
2b. mpmss.exe needs MVFF;
2c. locusss.exe had no build rule;
3. finaltest.c: main does not use argc,v so declare as main(void);
4. lockutw3.c: add parens to avoid operator-precedence warning;
5. protocol.h: s/interface/interfaceIn: suspected compiler bug.
(integrate from version/1.106/...@158054)
(159468)
MPS: attempt to fix w3i3mv "all" build with VC7:
(unknown if these changes are effective, but they should be safe)
1. mpm.c: +1 to array size to make room for terminator of string initializer;
2. testlib.c: disable warning 4702: unreachable code, for va_end.
(integrate from version/1.106/...@158055)
(159469)
Copied from Perforce
Change: 159471
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code/testlib.c')
| -rw-r--r-- | mps/code/testlib.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mps/code/testlib.c b/mps/code/testlib.c index 7010d2484d8..8cf36491cd3 100644 --- a/mps/code/testlib.c +++ b/mps/code/testlib.c | |||
| @@ -18,6 +18,16 @@ struct itimerspec; /* stop complaints from time.h */ | |||
| 18 | #endif | 18 | #endif |
| 19 | #include <time.h> | 19 | #include <time.h> |
| 20 | 20 | ||
| 21 | #ifdef MPS_OS_W3 | ||
| 22 | #ifdef _MSC_VER | ||
| 23 | #pragma warning(disable: 4702) /* unreachable code */ | ||
| 24 | /* job000605: believed needed to prevent VC7 warning | ||
| 25 | * for error() below, in which va_end is mandated by | ||
| 26 | * ISO C (C99:7.15.1) even though it is unreachable. | ||
| 27 | */ | ||
| 28 | #endif | ||
| 29 | #endif | ||
| 30 | |||
| 21 | 31 | ||
| 22 | /* rnd -- a random number generator | 32 | /* rnd -- a random number generator |
| 23 | * | 33 | * |