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/image.c | |
| parent | 7f5515125fbc9b46454e1f84b7e3052a0a5326f0 (diff) | |
| parent | 4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda (diff) | |
| download | emacs-da85a02af7585384008d3ebec836a7b8571f175d.tar.gz emacs-da85a02af7585384008d3ebec836a7b8571f175d.zip | |
Merge from trunk.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/image.c b/src/image.c index a09fc7a8979..f6626f61c83 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -5002,9 +5002,7 @@ pbm_scan_number (unsigned char **s, unsigned char *end) | |||
| 5002 | occurred. *SIZE is set to the size of the file. */ | 5002 | occurred. *SIZE is set to the size of the file. */ |
| 5003 | 5003 | ||
| 5004 | static char * | 5004 | static char * |
| 5005 | pbm_read_file (file, size) | 5005 | pbm_read_file (Lisp_Object file, int *size) |
| 5006 | Lisp_Object file; | ||
| 5007 | int *size; | ||
| 5008 | { | 5006 | { |
| 5009 | FILE *fp = NULL; | 5007 | FILE *fp = NULL; |
| 5010 | char *buf = NULL; | 5008 | char *buf = NULL; |