# HG changeset patch # User Steven Tamm # Date 1078984601 0 # Node ID e1815def22034c938245913a310384291b09f254 # Parent c0422921b53701e74cbf9125358eef1ac8768abc * image.c [MAC_OSX]: Include sys/stat.h * macfns.c (syms_of_macfns): Remove definitions of things now defined in image.c diff -r c0422921b537 -r e1815def2203 src/ChangeLog --- a/src/ChangeLog Thu Mar 11 05:45:22 2004 +0000 +++ b/src/ChangeLog Thu Mar 11 05:56:41 2004 +0000 @@ -1,3 +1,9 @@ +2004-03-11 Steven Tamm + * image.c [MAC_OSX]: Include sys/stat.h + + * macfns.c (syms_of_macfns): Remove definitions of things now + defined in image.c + 2004-03-11 Kim F. Storm The following changes consolidates the identical/similar image diff -r c0422921b537 -r e1815def2203 src/image.c --- a/src/image.c Thu Mar 11 05:45:22 2004 +0000 +++ b/src/image.c Thu Mar 11 05:56:41 2004 +0000 @@ -92,6 +92,7 @@ #include #endif #ifdef MAC_OSX +#include #include #else /* not MAC_OSX */ #include diff -r c0422921b537 -r e1815def2203 src/macfns.c --- a/src/macfns.c Thu Mar 11 05:45:22 2004 +0000 +++ b/src/macfns.c Thu Mar 11 05:56:41 2004 +0000 @@ -4391,22 +4391,6 @@ set_frame_fontset_func = x_set_font; check_window_system_func = check_mac; - Qjpeg = intern ("jpeg"); - staticpro (&Qjpeg); - - Qtiff = intern ("tiff"); - staticpro (&Qtiff); - - Qgif = intern ("gif"); - staticpro (&Qgif); - - Qpng = intern ("png"); - staticpro (&Qpng); - - defsubr (&Sclear_image_cache); - defsubr (&Simage_size); - defsubr (&Simage_mask_p); - hourglass_atimer = NULL; hourglass_shown_p = 0;