diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/unexcoff.c | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/unexcoff.c')
| -rw-r--r-- | src/unexcoff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/unexcoff.c b/src/unexcoff.c index 0c6af414d82..fb221dacda2 100644 --- a/src/unexcoff.c +++ b/src/unexcoff.c | |||
| @@ -141,8 +141,7 @@ report_error_1 (int fd, const char *msg, int a1, int a2) | |||
| 141 | error (msg, a1, a2); | 141 | error (msg, a1, a2); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static int make_hdr (int, int, unsigned, unsigned, unsigned, | 144 | static int make_hdr (int, int, const char *, const char *); |
| 145 | const char *, const char *); | ||
| 146 | static int copy_text_and_data (int, int); | 145 | static int copy_text_and_data (int, int); |
| 147 | static int copy_sym (int, int, const char *, const char *); | 146 | static int copy_sym (int, int, const char *, const char *); |
| 148 | static void mark_x (const char *); | 147 | static void mark_x (const char *); |