diff options
| author | Tom Tromey | 2013-07-06 23:18:58 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-07-06 23:18:58 -0600 |
| commit | 6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch) | |
| tree | f5f331ea361ba0f99e0f9b638d183ad492a7da31 /lib-src/make-docfile.c | |
| parent | 0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff) | |
| parent | 219afb88d9d484393418820d1c08dc93299110ec (diff) | |
| download | emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.zip | |
merge from trunk
this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
Diffstat (limited to 'lib-src/make-docfile.c')
| -rw-r--r-- | lib-src/make-docfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 8fa70dd430e..9bc91bc4f77 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -276,7 +276,7 @@ struct rcsoc_state | |||
| 276 | /* Output CH to the file or buffer in STATE. Any pending newlines or | 276 | /* Output CH to the file or buffer in STATE. Any pending newlines or |
| 277 | spaces are output first. */ | 277 | spaces are output first. */ |
| 278 | 278 | ||
| 279 | static inline void | 279 | static void |
| 280 | put_char (int ch, struct rcsoc_state *state) | 280 | put_char (int ch, struct rcsoc_state *state) |
| 281 | { | 281 | { |
| 282 | int out_ch; | 282 | int out_ch; |