Mercurial > hg > xemacs-beta
comparison src/libinterface.h @ 1743:543769b89fed
[xemacs-hg @ 2003-10-14 05:02:57 by james]
New compiler.h contains compiler-specific defines. Use it everywhere.
author | james |
---|---|
date | Tue, 14 Oct 2003 05:03:13 +0000 |
parents | 26a2f3423141 |
children | 1cecc3e9f0a0 |
comparison
equal
deleted
inserted
replaced
1742:7f92ee59c996 | 1743:543769b89fed |
---|---|
26 #ifdef HAVE_GIF | 26 #ifdef HAVE_GIF |
27 #include "gifrlib.h" | 27 #include "gifrlib.h" |
28 #endif /* HAVE_GIF */ | 28 #endif /* HAVE_GIF */ |
29 | 29 |
30 #ifdef HAVE_PNG | 30 #ifdef HAVE_PNG |
31 #ifdef __cplusplus | 31 BEGIN_C_DECLS |
32 extern "C" { | |
33 #endif | |
34 #define message message_ /* Yuck */ | 32 #define message message_ /* Yuck */ |
35 /* See comment in libinterface.c for the following */ | 33 /* See comment in libinterface.c for the following */ |
36 #define PNG_EXPORT(type, symbol) type XCDECL symbol | 34 #define PNG_EXPORT(type, symbol) type XCDECL symbol |
37 #define ZEXPORT XCDECL | 35 #define ZEXPORT XCDECL |
38 #define ZEXPORTVA XCDECL | 36 #define ZEXPORTVA XCDECL |
39 #include <png.h> | 37 #include <png.h> |
40 #undef message | 38 #undef message |
41 #ifdef __cplusplus | 39 END_C_DECLS |
42 } | |
43 #endif | |
44 #endif /* HAVE_PNG */ | 40 #endif /* HAVE_PNG */ |
45 | 41 |
46 /* #### WARNING: Utterly random magic here to prevent namespace conflicts | 42 /* #### WARNING: Utterly random magic here to prevent namespace conflicts |
47 when no one bothers to be the least bit namespace-clean. Potential | 43 when no one bothers to be the least bit namespace-clean. Potential |
48 problems: INT32, FAR. DONT_NEED_JPEG avoids the problem with FAR in | 44 problems: INT32, FAR. DONT_NEED_JPEG avoids the problem with FAR in |
49 glyphs-msw.c. For some reason, putting the XPM code after this fixes | 45 glyphs-msw.c. For some reason, putting the XPM code after this fixes |
50 other problems; don't move it before. --ben */ | 46 other problems; don't move it before. --ben */ |
51 #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) | 47 #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) |
52 #ifdef __cplusplus | 48 BEGIN_C_DECLS |
53 extern "C" { | |
54 #endif | |
55 #ifdef _MSC_VER | 49 #ifdef _MSC_VER |
56 # ifndef XMD_H | 50 # ifndef XMD_H |
57 /* Yuck! This tricks jpeglib.h into not defining INT32, which is defined | 51 /* Yuck! This tricks jpeglib.h into not defining INT32, which is defined |
58 in VC98/INCLUDE/basetsd.h */ | 52 in VC98/INCLUDE/basetsd.h */ |
59 # define UNDEF_XMD_H_ME_HARDER | 53 # define UNDEF_XMD_H_ME_HARDER |
63 #include <jpeglib.h> | 57 #include <jpeglib.h> |
64 #ifdef UNDEF_XMD_H_ME_HARDER | 58 #ifdef UNDEF_XMD_H_ME_HARDER |
65 # undef XMD_H | 59 # undef XMD_H |
66 #endif | 60 #endif |
67 #include <jerror.h> | 61 #include <jerror.h> |
68 #ifdef __cplusplus | 62 END_C_DECLS |
69 } | |
70 #endif | |
71 | 63 |
72 boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo); | 64 boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo); |
73 boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo); | 65 boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo); |
74 JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, | 66 JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, |
75 JSAMPARRAY scanlines, | 67 JSAMPARRAY scanlines, |