Mercurial > hg > xemacs-beta
view src/libinterface.c @ 4932:8b63e21b0436
fix compile issues with gcc 4
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF):
Use -export-all-symbols instead of -export-dynamic on PE targets
(Cygwin and MinGW).
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
Create variable XEMACS_CC_GPP to check whether we're running g++.
Don't just check for an executable called `g++' -- it might be
called g++-4 or whatever. Instead, check for either named `g++*'
or claiming to be g++ when called with --version. Rewrite code do
use the variable.
Add -fno-strict-aliasing to optimization flags when GCC and
optimized, and in all cases with g++, since under these circumstances
strict aliasing is otherwise assumed, and XEmacs can't easily be
made to respect its restrictions.
* configure: Regenerate.
lib-src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* fakemail.c (args_size):
* fakemail.c (parse_header):
* ootags.c (C_entries):
Fix warnings about possible use of uninitialized vars.
lwlib/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* xlwgauge.c (GaugeResize):
* xlwgauge.c (GaugeSize):
Fix warnings about possible use of uninitialized vars.
modules/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_exec):
* postgresql/postgresql.c (Fpq_get_result):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* chartab.c (decode_char_table_range):
* extents.c (extent_fragment_update):
* objects-msw.c (initialize_font_instance):
* process.c (Fgetenv):
* redisplay-output.c (get_next_display_block):
Fix warnings about possible use of uninitialized vars.
* compiler.h:
* compiler.h (REGISTER):
* event-stream.c (is_scrollbar_event):
* window.c (window_scrollbar_width):
* window.c (window_scrollbar_height):
* window.c (window_left_window_gutter_width):
* window.c (window_right_window_gutter_width):
Add USED_IF_SCROLLBARS. Use it to fix warnings about unused
vars when --with-scrollbars=no.
* config.h.in:
Change comment to explain better why DECLARE_INLINE_HEADER
is needed.
* dialog-msw.c:
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
* emacs.c (main_1):
* event-msw.c (struct mswin_message_debug):
* event-msw.c (debug_output_mswin_message):
* font-mgr.c:
* font-mgr.c (Ffc_config_filename):
* glyphs-msw.c (struct):
* glyphs-msw.c (bitmap_table):
* glyphs-x.c (update_widget_face):
* intl-win32.c (struct lang_to_string):
* intl-win32.c (lang_to_string_table):
* nas.c:
* objects-xlike-inc.c:
* objects-xlike-inc.c (xft_find_charset_font):
* syswindows.h:
* win32.c (mswindows_output_last_error):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
* lisp.h:
G++ 4.3 needs #include <limits> to avoid errors about min/max.
* lisp.h (disabled_assert_with_message):
Use disabled_assert* whenever asserts are disabled. Rewrite
disabled_assert* to avoid complaints about unused vars by
pretending to use the vars but casting them to (void).
Remove code that defined assert() weirdly if DEBUG_XEMACS but
not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically
when DEBUG_XEMACS, and if the user has forced it off, then
so be it.
* lisp.h (SYMBOL_KEYWORD):
Put some of the combined `extern Lisp_Object's back under
the file they are declared in. Cosmetic fix.
* number.h:
Remove `extern Lisp_Object' decls that duplicate lisp.h,
since they have different C vs. C++ linkage.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 24 Jan 2010 22:04:58 -0600 |
parents | 26a2f3423141 |
children | 308d34e9f07d |
line wrap: on
line source
/* Interface to graphics/etc libraries, with cdecl calling convention. Copyright (C) 2002 Ben Wing This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "libinterface.h" /* YUUUUUUUUUUUUUUCK! This file exists only because VC++ lacks pragmas that let you change the default calling convention in the middle of a file. With optimization, we compile XEmacs using fastcall as the default convention; but libraries are not compiled this way, and thus need __cdecl in their declaration. Without the pragma, we either (a) depend on libraries that declare their external functions with suitable preprocessor definitions that we can change; (b) force the user to recompile the library with fastcall (not reasonable); (c) hack the headers manually (not reasonable); (d) put all calls to the library in a separate file where the default calling convention is __cdecl (hence, this file). In fact, some libraries do make (a) feasible. This is the case with PNG and ZLIB. JPEG almost does so, since all externs are wrapped with EXTERN(); but they fail to wrap their definition of EXTERN with #ifndef EXTERN, so we can't override it. XPM is similar, wrapping their externs with FUNC() -- again, not overridable. With PNG, we define PNG_EXPORT; with ZLIB, we define ZEXPORT and ZEXPORTVA. */ #ifdef HAVE_XPM void qxe_XpmFreeXpmImage (XpmImage *image) { XpmFreeXpmImage (image); } void qxe_XpmFreeXpmInfo (XpmInfo *info) { XpmFreeXpmInfo (info); } int qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, XpmInfo *info) { return XpmCreateXpmImageFromBuffer (buffer, image, info); } void qxe_XpmFree (void *ptr) { XpmFree (ptr); } int qxe_XpmReadFileToData (char *filename, char ***data_return) { return XpmReadFileToData (filename, data_return); } #endif /* HAVE_XPM */ #ifdef HAVE_JPEG boolean qxe_jpeg_finish_decompress (j_decompress_ptr cinfo) { return jpeg_finish_decompress (cinfo); } boolean qxe_jpeg_start_decompress (j_decompress_ptr cinfo) { return jpeg_start_decompress (cinfo); } JDIMENSION qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines, JDIMENSION max_lines) { return jpeg_read_scanlines (cinfo, scanlines, max_lines); } int qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image) { return jpeg_read_header (cinfo, require_image); } void qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize) { jpeg_CreateDecompress (cinfo, version, structsize); } struct jpeg_error_mgr * qxe_jpeg_std_error (struct jpeg_error_mgr *err) { return jpeg_std_error (err); } void qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo) { jpeg_destroy_decompress (cinfo); } boolean qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired) { return jpeg_resync_to_restart (cinfo, desired); } #endif /* HAVE_JPEG */ #ifdef HAVE_TIFF tdata_t qxe_TIFFmalloc (tsize_t x1) { return _TIFFmalloc (x1); } void qxe_TIFFfree (tdata_t x1) { _TIFFfree (x1); } void qxe_TIFFClose (TIFF *x1) { TIFFClose (x1); } int qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3) { return TIFFGetField (x1, x2, x3); } TIFF * qxe_TIFFClientOpen (const char *x1, const char *x2, thandle_t x3, TIFFReadWriteProc x4, TIFFReadWriteProc x5, TIFFSeekProc x6, TIFFCloseProc x7, TIFFSizeProc x8, TIFFMapFileProc x9, TIFFUnmapFileProc x10) { return TIFFClientOpen (x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); } TIFFErrorHandler qxe_TIFFSetErrorHandler (TIFFErrorHandler x1) { return TIFFSetErrorHandler (x1); } TIFFErrorHandler qxe_TIFFSetWarningHandler (TIFFErrorHandler x1) { return TIFFSetWarningHandler (x1); } int qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, int x5) { return TIFFReadRGBAImage (x1, x2, x3, x4, x5); } #endif /* HAVE_TIFF */