aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Tamm2004-03-11 05:56:41 +0000
committerSteven Tamm2004-03-11 05:56:41 +0000
commit5243c06a3adf27d5904bf02f3ff9f4456a3e9ad8 (patch)
tree91ef04b3420bb1ac838f2862043e62708dd92e82 /src
parent1b9f8cecccc8738bfaa864a90411c903dca029c7 (diff)
downloademacs-5243c06a3adf27d5904bf02f3ff9f4456a3e9ad8.tar.gz
emacs-5243c06a3adf27d5904bf02f3ff9f4456a3e9ad8.zip
* image.c [MAC_OSX]: Include sys/stat.h
* macfns.c (syms_of_macfns): Remove definitions of things now defined in image.c
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/image.c1
-rw-r--r--src/macfns.c16
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 @@
12004-03-11 Steven Tamm <steventamm@mac.com>
2 * image.c [MAC_OSX]: Include sys/stat.h
3
4 * macfns.c (syms_of_macfns): Remove definitions of things now
5 defined in image.c
6
12004-03-11 Kim F. Storm <storm@cua.dk> 72004-03-11 Kim F. Storm <storm@cua.dk>
2 8
3 The following changes consolidates the identical/similar image 9 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;
92#include <alloca.h> 92#include <alloca.h>
93#endif 93#endif
94#ifdef MAC_OSX 94#ifdef MAC_OSX
95#include <sys/stat.h>
95#include <QuickTime/QuickTime.h> 96#include <QuickTime/QuickTime.h>
96#else /* not MAC_OSX */ 97#else /* not MAC_OSX */
97#include <Windows.h> 98#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. */);
4391 set_frame_fontset_func = x_set_font; 4391 set_frame_fontset_func = x_set_font;
4392 check_window_system_func = check_mac; 4392 check_window_system_func = check_mac;
4393 4393
4394 Qjpeg = intern ("jpeg");
4395 staticpro (&Qjpeg);
4396
4397 Qtiff = intern ("tiff");
4398 staticpro (&Qtiff);
4399
4400 Qgif = intern ("gif");
4401 staticpro (&Qgif);
4402
4403 Qpng = intern ("png");
4404 staticpro (&Qpng);
4405
4406 defsubr (&Sclear_image_cache);
4407 defsubr (&Simage_size);
4408 defsubr (&Simage_mask_p);
4409
4410 hourglass_atimer = NULL; 4394 hourglass_atimer = NULL;
4411 hourglass_shown_p = 0; 4395 hourglass_shown_p = 0;
4412 4396