diff options
| author | Richard Brooksby | 2013-05-08 15:36:19 +0100 |
|---|---|---|
| committer | Richard Brooksby | 2013-05-08 15:36:19 +0100 |
| commit | 45d5d00f6916a859b7ad5da47ba15cb2f0bad1ea (patch) | |
| tree | 46bac35e9b06b27f39f2a6bd5201542f30067aec /mps/code | |
| parent | 2b9ba179a7a7c81950d394e84ddcdd5795eca7b9 (diff) | |
| parent | 5ad362172043dedeaea29d2ba83fb3405f06aa4a (diff) | |
| download | emacs-45d5d00f6916a859b7ad5da47ba15cb2f0bad1ea.tar.gz emacs-45d5d00f6916a859b7ad5da47ba15cb2f0bad1ea.zip | |
Merging mps version 1.111 changes back to master.
Copied from Perforce
Change: 181631
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
| -rw-r--r-- | mps/code/lockutw3.c | 1 | ||||
| -rw-r--r-- | mps/code/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mps/code/lockutw3.c b/mps/code/lockutw3.c index b135f0e1d43..51a1206a37d 100644 --- a/mps/code/lockutw3.c +++ b/mps/code/lockutw3.c | |||
| @@ -74,6 +74,7 @@ int main(int argc, char *argv[]) | |||
| 74 | Insist(lock != NULL); | 74 | Insist(lock != NULL); |
| 75 | 75 | ||
| 76 | LockInit(lock); | 76 | LockInit(lock); |
| 77 | UNUSED(argc); | ||
| 77 | 78 | ||
| 78 | shared = 0; | 79 | shared = 0; |
| 79 | 80 | ||
diff --git a/mps/code/version.c b/mps/code/version.c index 03e7b78334e..0a9afed3476 100644 --- a/mps/code/version.c +++ b/mps/code/version.c | |||
| @@ -29,7 +29,7 @@ SRCID(version, "$Id$"); | |||
| 29 | * (Note: before 2006-02-01 the style was "release.epcore.chub") | 29 | * (Note: before 2006-02-01 the style was "release.epcore.chub") |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #define MPS_RELEASE "release/1.110.0" | 32 | #define MPS_RELEASE "release/1.111.0" |
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | /* MPSCopyrightNotice -- copyright notice for the binary | 35 | /* MPSCopyrightNotice -- copyright notice for the binary |