diff options
| author | Paul Eggert | 2011-07-10 23:05:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-10 23:05:57 -0700 |
| commit | da85a02af7585384008d3ebec836a7b8571f175d (patch) | |
| tree | e6d4f34119ea1c45985eaed207ef6b47f650ea93 /src/tparam.c | |
| parent | 7f5515125fbc9b46454e1f84b7e3052a0a5326f0 (diff) | |
| parent | 4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda (diff) | |
| download | emacs-da85a02af7585384008d3ebec836a7b8571f175d.tar.gz emacs-da85a02af7585384008d3ebec836a7b8571f175d.zip | |
Merge from trunk.
Diffstat (limited to 'src/tparam.c')
| -rw-r--r-- | src/tparam.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tparam.c b/src/tparam.c index 6aae0b97db9..ed28cd7397f 100644 --- a/src/tparam.c +++ b/src/tparam.c | |||
| @@ -265,9 +265,8 @@ tparam1 (const char *string, char *outstring, int len, | |||
| 265 | 265 | ||
| 266 | #ifdef DEBUG | 266 | #ifdef DEBUG |
| 267 | 267 | ||
| 268 | main (argc, argv) | 268 | int |
| 269 | int argc; | 269 | main (int argc, char **argv) |
| 270 | char **argv; | ||
| 271 | { | 270 | { |
| 272 | char buf[50]; | 271 | char buf[50]; |
| 273 | int args[3]; | 272 | int args[3]; |