diff options
-rw-r--r-- | src/ChangeLog | 6 | ||||
-rw-r--r-- | src/image.c | 1 | ||||
-rw-r--r-- | src/macfns.c | 16 |
3 files changed, 7 insertions, 16 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bcda2d45958..df407ca48b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2004-03-11 Steven Tamm <steventamm@mac.com> + * 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 <storm@cua.dk> The following changes consolidates the identical/similar image diff --git a/src/image.c b/src/image.c index 9704f6d14f0..1067227859c 100644 --- a/src/image.c +++ b/src/image.c @@ -92,6 +92,7 @@ typedef HDC XImagePtr_or_DC; #include <alloca.h> #endif #ifdef MAC_OSX +#include <sys/stat.h> #include <QuickTime/QuickTime.h> #else /* not MAC_OSX */ #include <Windows.h> diff --git a/src/macfns.c b/src/macfns.c index a9dcdc5e85a..18697c59a49 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -4391,22 +4391,6 @@ Chinese, Japanese, and Korean. */); 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; |