aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorJoakim Verona2011-07-15 04:39:29 +0200
committerJoakim Verona2011-07-15 04:39:29 +0200
commit4f616a2e7ed1db28da98df90266e9751a8ae9ee1 (patch)
tree74a9dcbe13e945e712ae04a4a94c2202ca720591 /src/image.c
parentff2be00005c3aeda6e11d7ed264ce86f02b60958 (diff)
parentec2bc542a4d0127425625e8cb458684bd825675a (diff)
downloademacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.tar.gz
emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.zip
merge from upstream
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/image.c b/src/image.c
index 6e8440fb431..fa39ff12681 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5007,9 +5007,7 @@ pbm_scan_number (unsigned char **s, unsigned char *end)
5007 occurred. *SIZE is set to the size of the file. */ 5007 occurred. *SIZE is set to the size of the file. */
5008 5008
5009static char * 5009static char *
5010pbm_read_file (file, size) 5010pbm_read_file (Lisp_Object file, int *size)
5011 Lisp_Object file;
5012 int *size;
5013{ 5011{
5014 FILE *fp = NULL; 5012 FILE *fp = NULL;
5015 char *buf = NULL; 5013 char *buf = NULL;