Mercurial > hg > xemacs-beta
annotate src/libinterface.h @ 5632:bd80d9103fc8
Integrate CL code better into core, remove obsolete compatibility code.
lisp/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
Call #'cl-compile-time-init explicitly here, don't rely on
bytecomp-load-hook for what is core functionality.
* cl-extra.el:
* cl-extra.el (require):
* cl-extra.el (make-random-state):
* cl-extra.el (random-state-p):
* cl-extra.el (make-hashtable): Removed.
* cl-extra.el (make-weak-hashtable): Removed.
* cl-extra.el (make-key-weak-hashtable): Removed.
* cl-extra.el (make-value-weak-hashtable): Removed.
* cl-extra.el ('hashtablep): Removed.
* cl-extra.el ('hashtable-fullness): Removed.
* cl-extra.el ('hashtable-test-function): Removed.
* cl-extra.el ('hashtable-type): Removed.
* cl-extra.el ('hashtable-size): Removed.
* cl-extra.el ('copy-hashtable): Removed.
* cl-extra.el (cl-builtin-gethash): Removed.
* cl-extra.el (cl-builtin-remhash): Removed.
* cl-extra.el (cl-builtin-clrhash): Removed.
* cl-extra.el (cl-builtin-maphash): Removed.
* cl-extra.el ('cl-gethash): Removed.
* cl-extra.el ('cl-puthash): Removed.
* cl-extra.el ('cl-remhash): Removed.
* cl-extra.el ('cl-clrhash): Removed.
* cl-extra.el ('cl-maphash): Removed.
* cl-extra.el ('cl-make-hash-table): Removed.
* cl-extra.el ('cl-hash-table-p): Removed.
* cl-extra.el ('cl-hash-table-count): Removed.
* cl-extra.el (cl-prettyexpand):
* cl-extra.el (names):
Remove compatibility aliases from this file.
In #'cl-prettyexpand, if FULL is nil, don't expand return-from
either, for symmetry with not expanding block.
Drop cl-extra-load-hook, it's useless when cl-extra is dumped
(since third-party code can't use it, and dumped code shouldn't
use it.)
* cl-macs.el:
* cl-macs.el (cl-pop2):
* cl-macs.el (defun*):
* cl-macs.el (cl-parse-loop-clause):
Remove some no-longer-needed compatibility kludges.
* cl.el:
* cl.el ('cl-map-extents): Removed.
* cl.el (cl-random-time):
* cl.el (list*): New, moved back from subr.el, given a shorter
implementation.
* cl.el ('cl-member): Removed.
* cl.el ('cl-floor): Removed.
* cl.el ('cl-ceiling): Removed.
* cl.el ('cl-truncate): Removed.
* cl.el ('cl-round): Removed.
* cl.el ('cl-mod): Removed.
Remove some compatibility aliases; these may conflict with
package usage, in which case the packages need to be updated, the
new names are available in 21.4, and that's the most recent
version we support.
* cl.el (cl-hacked-flag): Removed.
* cl.el (cl-hack-byte-compiler): Removed.
* subr.el:
* subr.el (list*): Moved back to cl.el.
* update-elc-2.el (batch-update-elc-2):
* update-elc.el (do-autoload-commands):
Add an autoload for cl-compile-time-init in these two files, they
run on bare temacs, auto-autoload isn't available to them, and now
bytecomp calls cl-compile-time-init explicitly.
* cl-compat.el: Removed. This file was long obsolete.
man/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Top):
* cl.texi (Usage):
* cl.texi (Organization):
* cl.texi (Efficiency Concerns):
* cl.texi (Common Lisp Compatibility):
Remove documentation of cl-compat, now it's deleted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 30 Dec 2011 16:05:31 +0000 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 870 | 1 /* Define prototypes for graphics library interface functions. |
| 2 Copyright (C) 2002 Ben Wing. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4708
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 870 | 7 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4708
diff
changeset
|
8 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4708
diff
changeset
|
9 option) any later version. |
| 870 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4708
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 870 | 18 |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 21 #ifndef INCLUDED_libinterface_h_ | |
| 22 #define INCLUDED_libinterface_h_ | |
| 23 | |
| 24 #ifdef HAVE_GIF | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
1743
diff
changeset
|
25 #include <gif_lib.h> |
| 870 | 26 #endif /* HAVE_GIF */ |
| 27 | |
| 28 #ifdef HAVE_PNG | |
| 1743 | 29 BEGIN_C_DECLS |
| 870 | 30 #define message message_ /* Yuck */ |
| 31 /* See comment in libinterface.c for the following */ | |
| 32 #define PNG_EXPORT(type, symbol) type XCDECL symbol | |
| 33 #define ZEXPORT XCDECL | |
| 34 #define ZEXPORTVA XCDECL | |
| 35 #include <png.h> | |
| 36 #undef message | |
| 1743 | 37 END_C_DECLS |
| 870 | 38 #endif /* HAVE_PNG */ |
| 39 | |
| 40 /* #### WARNING: Utterly random magic here to prevent namespace conflicts | |
| 41 when no one bothers to be the least bit namespace-clean. Potential | |
| 42 problems: INT32, FAR. DONT_NEED_JPEG avoids the problem with FAR in | |
| 43 glyphs-msw.c. For some reason, putting the XPM code after this fixes | |
| 44 other problems; don't move it before. --ben */ | |
| 45 #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) | |
| 1743 | 46 BEGIN_C_DECLS |
| 870 | 47 #ifdef _MSC_VER |
| 48 # ifndef XMD_H | |
| 49 /* Yuck! This tricks jpeglib.h into not defining INT32, which is defined | |
| 50 in VC98/INCLUDE/basetsd.h */ | |
| 51 # define UNDEF_XMD_H_ME_HARDER | |
| 52 # define XMD_H | |
| 53 # endif | |
| 54 #endif /* _MSC_VER */ | |
| 55 #include <jpeglib.h> | |
| 56 #ifdef UNDEF_XMD_H_ME_HARDER | |
| 57 # undef XMD_H | |
| 58 #endif | |
| 59 #include <jerror.h> | |
| 1743 | 60 END_C_DECLS |
| 870 | 61 |
| 62 boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo); | |
| 63 boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo); | |
| 64 JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, | |
| 65 JSAMPARRAY scanlines, | |
| 66 JDIMENSION max_lines); | |
| 67 int XCDECL qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image); | |
| 68 #define qxe_jpeg_create_decompress(cinfo) \ | |
| 69 qxe_jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \ | |
| 70 (size_t) sizeof(struct jpeg_decompress_struct)) | |
| 71 void XCDECL qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, | |
| 72 size_t structsize); | |
| 73 struct jpeg_error_mgr * XCDECL qxe_jpeg_std_error (struct jpeg_error_mgr *err); | |
| 74 void XCDECL qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo); | |
| 75 boolean XCDECL qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired); | |
| 76 | |
| 77 #endif /* defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) */ | |
| 78 | |
| 79 #ifdef HAVE_XPM | |
| 80 | |
| 81 #ifndef HAVE_GTK /* #### ????????????????????? No comprendo ni un poco. | |
| 82 This was here before, in a different file. --ben */ | |
| 83 #include <X11/xpm.h> | |
| 84 #endif | |
| 85 | |
| 86 void XCDECL qxe_XpmFreeXpmImage (XpmImage *image); | |
| 87 void XCDECL qxe_XpmFreeXpmInfo (XpmInfo *info); | |
| 88 int XCDECL qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, | |
| 89 XpmInfo *info); | |
| 90 void XCDECL qxe_XpmFree (void *ptr); | |
| 91 int XCDECL qxe_XpmReadFileToData (char *filename, char ***data_return); | |
| 92 | |
| 93 #endif /* HAVE_XPM */ | |
| 94 | |
| 95 #ifdef HAVE_TIFF | |
| 96 #include "tiffio.h" | |
| 97 | |
| 98 tdata_t XCDECL qxe_TIFFmalloc (tsize_t x1); | |
| 99 void XCDECL qxe_TIFFfree (tdata_t x1); | |
| 100 void XCDECL qxe_TIFFClose (TIFF *x1); | |
| 101 int XCDECL qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3); | |
| 102 TIFF * XCDECL qxe_TIFFClientOpen (const char *x1, const char *x2, | |
| 103 thandle_t x3, TIFFReadWriteProc x4, | |
| 104 TIFFReadWriteProc x5, TIFFSeekProc x6, | |
| 105 TIFFCloseProc x7, TIFFSizeProc x8, | |
| 106 TIFFMapFileProc x9, TIFFUnmapFileProc x10); | |
| 107 TIFFErrorHandler XCDECL qxe_TIFFSetErrorHandler (TIFFErrorHandler x1); | |
| 108 TIFFErrorHandler XCDECL qxe_TIFFSetWarningHandler (TIFFErrorHandler x1); | |
| 109 int XCDECL qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, | |
| 110 int x5); | |
| 111 | |
| 112 #endif /* HAVE_TIFF */ | |
| 113 | |
| 114 #endif /* INCLUDED_libinterface_h_ */ |