qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to libXpm 3.5.8

Browse Source
This commit is contained in:
matthieu 2009-10-31 18:33:17 +00:00
parent c06fd4db3a
commit 139377e246
45 changed files with 8999 additions and 6396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

493
lib/libXpm/ChangeLog
View File

@ -1,101 +1,452 @@
2006-06-02 Alan Coopersmith <alan.coopersmith@sun.com>
commit 130b2fb0ea716143c63ba30856eecb351bc2af2a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 9 10:32:08 2009 -0700
* src/hashtab.c (xpmHashTableInit):
Always initialize atomTable to NULL, so xpmHashTableFree() doesn't
try to free a random value from the stack if xpmHashTableInit returns
an error.
libXpm 3.5.8
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
* src/create.c (xpmParseDataAndCreate):
Coverity #1432: Returned without freeing storage "hints_cmt"
(in error case when xpmHashTableInit failed)
* src/parse.c (xpmParseData):
Coverity #1415: Returned without freeing storage "hints_cmt"
(in error case when xpmHashTableInit failed)
2006-04-26 Adam Jackson <ajax@freedesktop.org>
commit a195bd6d375c311b9bf6d7cce477f1d131425757
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 21:29:45 2009 -0700
* configure.ac:
Bump to 3.5.5
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2006-03-18 Matthieu Herrb <matthieu.herrb@laas.fr>
commit f4c43f70dff3cb9702fd62bc388353d02589e618
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 20:27:49 2009 -0700
* src/Attrib.c: XpmFreeExtensions
doublecheck that a pointer is not NULL before dereferencing it.
(Coverity CID 121).
Replace AC_DEFINE_DIR with AX_DEFINE_DIR from Autoconf Archive
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit d846316822ba8eb545d41140007ef98a7de9274e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 19 01:34:19 2009 -0700
* configure.ac:
Update package version number for final X11R7 release candidate.
Update AC_DEFINE_DIR to latest version from Autoconf Archive
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 53f8b42f89214b85804ae9e64c49d1a9c2a7553d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:35 2009 -0800
* cxpm/Makefile.am:
* sxpm/Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 6697e31fbb616656b7f34515a79454af394b500a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 15:45:20 2009 -0200
* configure.ac:
Update package version number for X11R7 RC3 release.
Janitor: ansification, make distcheck, .gitignore
The ansification code is minor edit of the patch (by me) at
https://bugs.freedesktop.org/show_bug.cgi?id=14727
as it would not apply cleanly anymore.
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 41e4e2de4d73d098d332ece0410e9f8fda4fe10d
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Mon Oct 20 19:36:52 2008 -0700
* xpm.pc.in:
Update pkgconfig files to separate library build-time dependencies
from application build-time dependencies.
* configure.ac:
Update dependencies to work with separate build roots.
X.Org Bug 17944: avoid gcc warning for libXpm
<http://bugs.freedesktop.org/show_bug.cgi?id=17944>
Avoid the gcc warning
cxpm/cxpm.c:102: warning: no previous prototype for 'ErrorMessage'
2005-11-12 Alan Coopersmith <alan.coopersmith@sun.com>
commit 64323668c07b4768c57649f5ec7e2888265d1aeb
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:57:47 2008 +0100
* configure.ac:
* cxpm/Makefile.am:
* sxpm/Makefile.am:
Use sed to substitute variables in man pages
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
nuke RCS Ids
* configure.ac:
Update package version number for X11R7 RC2 release.
commit 6ef45c37160079a9aa551adcd841abdb55eabae3
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Thu Jan 31 14:42:41 2008 +1030
2005-10-28 Alan Coopersmith <alan.coopersmith@sun.com>
Use libtools SED check rather than autoconf's SED check.
AC_PROG_SED required autoconf 2.60, libtool's should work
regardless. This keeps us supporting 2.57 of autoconf
Found by: Tinderbox (1.4.1 compile)
* configure.ac:
Add --enable-stat-zfile (on by default) to replace Imake's
ZFILEDEF = -DSTAT_ZFILE to enable automatically searching
for file.xpm.Z & file.xpm.gz when file.xpm is requested.
commit 3f7624048aa6064c69e2320a70fb7fc89e0bb7ef
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 24 14:26:34 2008 -0800
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
Bug 14171: sxpm/Makefile.am:21: SED was already defined
<http://bugs.freedesktop.org/show_bug.cgi?id=14171>
* configure.ac:
Update package version number for RC1 release.
commit 503843fd3066031adbd4a362c686acc721787b7d
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:36 2007 -0500
2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
Replace static ChangeLog with dist-hook to generate from git log
* Makefile.am:
* src/Makefile.am:
Add missing files to EXTRA_DIST
commit 3e37dd39b6169af9928d5b959c40ba79a07450ee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 22 13:23:30 2007 -0700
* cxpm/Makefile.am:
* sxpm/Makefile.am:
Fix man page installation
Version bump: 3.5.7
2005-07-08 Keith Packard <keithp@keithp.com>
commit d82244497b54889f91c78585374d1ad6a0cef2cf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 22 13:08:42 2007 -0700
* .cvsignore:
* cxpm/.cvsignore:
* src/.cvsignore:
* sxpm/.cvsignore:
Add .cvsignore files
Replace strcpy with strncpy to match previous code block
2005-06-09 Alexander Gottwald <ago@freedesktop.org>
commit 47c974872b51b8c1d6965eff4599f8ce739bcedc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 6 14:22:48 2007 -0700
* cxpm/Makefile.am: Use $(top_srcdir)/src instead of $(top_builddir)/src
in INCLUDES
Use srcdir in paths passed to xgettext when making .po files
2005-05-19 Soren Sandmann <ssp@aware-of-vacuity.boston.redhat.com>
commit 6e003fd5f174a8e312d799d7f8812c2a5b87e433
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 6 12:59:04 2007 -0700
* sxpm/Makefile.am: Add $(top_builddir)/include to INCLUDES
Replace index/rindex with C89 standard strchr/strrchr
commit 43dfc6be8128139888426d8c709aa78efc207953
Author: Jason Rumney <jasonr@gnu.org>
Date: Mon Aug 6 12:52:52 2007 -0700
X.Org Bug #11863: Build libXpm on MS Windows (with MinGW)
* src/XpmI.h [FOR_MSW]: Include simx.h instead of real X headers.
* src/simx.h (_XFUNCPROTOBEGIN, _XFUNCPROTOEND, NO_ZPIPE): Define.
(XAllocColor): Fix arg list in prototype.
(bzero, close, fdopen, index, rindex, open, strdup, O_RDONLY):
Map to W32 equivalents.
* src/RdFToI.c [FOR_MSW]: Include fcntl.h.
commit 290f0b9115428dab0cbf2880d154468c557b3e7e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 25 17:45:15 2007 -0700
Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4
commit d4bc7dc0dea218cea380aba972f10f60dc1e86ac
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 27 13:54:07 2007 -0700
Use AM_CFLAGS & AM_CPPFLAGS to replace per-program and obsolete macros
Clears some warnings from automake-1.10
commit 85a87de3c03ca8be526dedc0a2973f9426518c39
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 21 17:12:18 2006 -0800
Sun bug 4486226: Xpm is not internationalized
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4486226>
Use gettext() to allow translated messages in sxpm & cxpm
(cherry picked from bcda4f17ab3fa9f0572f876dbeb09b45fbc23f3d commit)
commit 3c881daddcc251d6e806715d267e4e55934abd1a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 21 15:13:44 2006 -0800
Add *~ to .gitignore to skip over emacs/patch droppings
commit 60817dd28774540622ea404f650db8389c66da54
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Oct 13 16:23:49 2006 -0400
Bump to 3.5.6
commit 12dc4dc15234ae818a21c20ebf7b2d053b7a94be
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 13 14:59:03 2006 -0700
renamed: .cvsignore -> .gitignore
commit 4daea919c3aa104b6caf8c0f42f49ae755545986
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jun 3 06:11:30 2006 +0000
Always initialize atomTable to NULL, so xpmHashTableFree() doesn't try to
free a random value from the stack if xpmHashTableInit returns an
error.
commit 19855d6e09aa36db7686ad6f538179bf87e9c6ea
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jun 2 19:48:01 2006 +0000
Coverity #1432: Returned without freeing storage "hints_cmt" (in error case
when xpmHashTableInit failed)
commit 000abcd371d0c4b1d0a5380023d74bf5bfc47685
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jun 2 19:33:29 2006 +0000
Coverity #1415: Returned without freeing storage "hints_cmt" (in error case
when xpmHashTableInit failed)
commit 5c70c99833d4040aaf595d0005b861e0a930ee66
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 27 00:19:37 2006 +0000
Bump to 3.5.5
commit 2dcc187c92c1a579e6e9f0bad999a3b4e47228c3
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Mar 18 15:18:56 2006 +0000
doublecheck that a pointer is not NULL before dereferencing it. (Coverity
CID 121).
commit 93421a53ccf159ff39bc9f8ff72c57246f9cb90c
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:31 2005 +0000
Update package version number for final X11R7 release candidate.
commit 2b229ddcb52a3bf9bef32e764f93cc57c1351420
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:44 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 50214deb692a9af760088f8e7a51955c7d3f1707
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:44 2005 +0000
Update package version number for X11R7 RC3 release.
commit 19881d3c88ff0713ef550382fd0dfb03123dabed
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:03:06 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit a6fbdb403efd3bf7e1179660959fd0e66a301ce0
Author: Kevin E Martin <kem@kem.org>
Date: Sat Nov 19 07:15:42 2005 +0000
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
commit 82513d04a8381da8d2281d7581f6b0d65901aede
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 13 02:08:07 2005 +0000
Use sed to substitute variables in man pages
commit d1b430289b2ddb6c1f3383c5288aa125b058508a
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:19:13 2005 +0000
Update package version number for X11R7 RC2 release.
commit e2c9276ccc1ef619dcfbdeb414ef0dec5113c1ee
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 29 02:26:49 2005 +0000
Add --enable-stat-zfile (on by default) to replace Imake's ZFILEDEF =
-DSTAT_ZFILE to enable automatically searching for file.xpm.Z &
file.xpm.gz when file.xpm is requested.
commit 2f57ab95012d9221cca1af6c0a1ccea5d308c66f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:11 2005 +0000
Update package version number for RC1 release.
commit 72bf88ed120fb888c57ed3223faa316403031b36
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 5 20:24:14 2005 +0000
Add missing files to EXTRA_DIST
Fix man page installation
commit 08c43c5f1f851c1acad360a28767670dc62d8a66
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Oct 3 19:53:58 2005 +0000
Last argument of variable parameter list needs to be casted to a pointer
type.
commit 5ecad7c12c3104d653972385f548e3f86532cbe3
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:52 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 703207d3b3718223d4b2711fb77fc96a4f3909ef
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jul 17 10:32:57 2005 +0000
fix build outside of $(srcdir)
commit 5a0177d4474787951c0cae56e285bb075ab405f3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 21:11:25 2005 +0000
Accept autoconf HAVE_STRLCPY as alias for HAS_STRLCAT
commit fd38ee667976855150d3c1231a1acc2cf1a89330
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 21:10:44 2005 +0000
Check for strlcat() for use in parse.c
commit 9b3eed6e4f7ee542149ecec0d017a3a460f7c084
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 16 07:23:39 2005 +0000
Set soversion to 4.11.0 with -version-number.
commit a705a1cd9dc4c4ba1940c9b59d2107ba59360e39
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 9 06:45:44 2005 +0000
Add .cvsignore files
commit b1d84a9fc9b15232c09b6ce5d96c097fdd4f0a15
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jun 9 13:42:36 2005 +0000
Use $(top_srcdir)/src instead of $(top_builddir)/src in INCLUDES
commit 769751fba3e32f49272d19799929e1ad5a3d2cd0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 17:09:13 2005 +0000
Add $(top_builddir)/include to INCLUDES
commit 2cc1896c61eef5739bb6a8ffa89e58ba5c175a05
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 15:02:48 2005 +0000
- Add build system for lib/Xpm
- Add Xpm to symlink.sh
- Conditionally include config.h in xc/extras/Xpm
commit cf0d69c7ace679f27f105c582760b9be14923aba
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 14:37:53 2005 +0000
Thu May 19 10:36:54 2005 Søren Sandmann <sandmann@redhat.com>
Add "../lib" to INCLUDES.
Replace #include "../lib/foo" with #include "foo".
commit 639b3598cd0e7214010248efb62b75ef85a8e5c5
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Feb 21 20:52:32 2005 +0000
Avoid inifite loops. From Chris Gilbert in bug #1920.
commit f1908d7ee5e2d2d44db2116b3c88213da9dfb854
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Dec 11 16:14:05 2004 +0000
Fix incomplete merge.
commit b041980732f6a6002001cfe079fdfb982937d4a8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Dec 11 16:08:59 2004 +0000
more s_open() cleanup.
commit 90d0638a42553786f54df333f0da4d008e9a0573
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Dec 11 16:04:34 2004 +0000
Replace s_popen() by a more specific function that allows only one command
in the pipe. Remove extraneous tests on file names that broke some
applications. From Alex Reisen in Bugzilla #1920.
commit 2c23dbf2cafaad72b1f45da915eb87a8f792fdb0
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Dec 8 01:16:48 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=830): Fix libXpm header (xpm.h) to
use the X11 function begin/end marker macros (_XFUNCPROTOBEGIN,
_XFUNCPROTOEND) instead of homegrown (native) C++ code. Patch by Kevin
DeKorte <kdekorte@yahoo.com>.
commit 50986a34f231fbc7a4b62466bd89bd4ae4027d2e
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Nov 25 21:19:11 2004 +0000
Fixes for CAN-2004-0914 (Thomas Biege).
commit a983dafac59dcb425666a5a5556da4734e50c6c5
Author: Egbert Eich <eich@suse.de>
Date: Tue Sep 21 17:57:35 2004 +0000
Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and
Alan Coopersmith from release 6.8.1.
Fail during initialization with error if font/fontset is not set for
widget. This prevents a sig11 later when the non-existent font/fontset
structs are referenced.
Check if xf86Info.kbdProc pointer is really set before calling it on abort
as this pointer won't be set if the new modular keyboard driver is used
(Matthias Hopf).
Added new libs to the bindist control files.
Removed inclusion of unnecessary kernel header on Linux. This may fail in
an -ansi environment.
commit 2773a7214e282f6f673483f5233b880505947c3f
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:42:32 2004 +0000
Merging XORG-CURRENT into trunk
commit 65c64a2eaa8698434f1869dcdcb5d9ccb21c6932
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:28:26 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 0b313707a677523fed9ac485445e8b09d2a85c13
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:09:53 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 658f8e9a9094ba5d18743694cad7275be53c7a25
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:34:33 2004 +0000
readding XFree86's cvs IDs
commit 9971f91864e8f722b42c58f2ff19025715f33b98
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:21:31 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit fbfe965054d8144946651b19085684af7f6715b9
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:27:16 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit c037348b5df0ac94ad4daba59f8bc9acf12ef623
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:24 2003 +0000
XFree86 4.3.0.1
commit aafaabc4a0bfab6544e085ee504ad69de4a5ddb1
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:24 2003 +0000
Initial revision

10
lib/libXpm/Makefile.am
View File

@ -15,3 +15,13 @@ EXTRA_DIST = \
README.AMIGA \
README.html \
README.MSW
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

46
lib/libXpm/Makefile.in
View File

@ -85,7 +85,6 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@ -104,8 +103,10 @@ BUILD_SXPM_TRUE = @BUILD_SXPM_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -115,6 +116,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -125,6 +127,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -144,6 +147,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -154,6 +158,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -164,13 +169,9 @@ USE_GETTEXT_TRUE = @USE_GETTEXT_TRUE@
VERSION = @VERSION@
XPM_CFLAGS = @XPM_CFLAGS@
XPM_LIBS = @XPM_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -187,23 +188,31 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -211,17 +220,9 @@ target_alias = @target_alias@
SUBDIRS = src sxpm cxpm
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xpm.pc
EXTRA_DIST = \
xpm.pc.in \
xpm.PS.gz \
CHANGES \
COPYRIGHT \
FAQ.html \
FILES \
README.AMIGA \
README.html \
README.MSW
EXTRA_DIST = xpm.pc.in xpm.PS.gz CHANGES COPYRIGHT FAQ.html FILES \
README.AMIGA README.html README.MSW ChangeLog
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -483,6 +484,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -612,6 +616,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@ -667,7 +672,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-libtool clean-recursive \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@ -681,6 +686,13 @@ uninstall-info: uninstall-info-recursive
uninstall uninstall-am uninstall-info-am \
uninstall-pkgconfigDATA
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

25
lib/libXpm/README
View File

@ -0,0 +1,25 @@
libXpm - X Pixmap (XPM) image file format library
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
Please submit bug reports to the Xorg bugzilla:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/lib/libXpm
http://cgit.freedesktop.org/xorg/lib/libXpm
For patch submission instructions, see:
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage

47
lib/libXpm/acinclude.m4
View File

@ -1,47 +1,46 @@
##### http://autoconf-archive.cryp.to/ac_define_dir.html
# ===========================================================================
# http://www.nongnu.org/autoconf-archive/ax_define_dir.html
# ===========================================================================
#
# SYNOPSIS
#
# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
# AX_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
#
# DESCRIPTION
#
# This macro sets VARNAME to the expansion of the DIR variable,
# taking care of fixing up ${prefix} and such.
# This macro sets VARNAME to the expansion of the DIR variable, taking
# care of fixing up ${prefix} and such.
#
# VARNAME is then offered as both an output variable and a C
# preprocessor symbol.
# VARNAME is then offered as both an output variable and a C preprocessor
# symbol.
#
# Example:
#
# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
# AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
#
# LAST MODIFICATION
# LICENSE
#
# 2006-10-13
# Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
# Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2008 Alexandre Oliva
#
# COPYLEFT
#
# Copyright (c) 2006 Stepan Kasal <kasal@ucw.cz>
# Copyright (c) 2006 Andreas Schwab <schwab@suse.de>
# Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2006 Alexandre Oliva
#
# Copying and distribution of this file, with or without
# modification, are permitted in any medium without royalty provided
# the copyright notice and this notice are preserved.
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved.
AC_DEFUN([AC_DEFINE_DIR], [
AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR])
AC_DEFUN([AX_DEFINE_DIR], [
prefix_NONE=
exec_prefix_NONE=
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
dnl refers to ${prefix}. Thus we have to use `eval' twice.
eval ac_define_dir="\"[$]$2\""
eval ac_define_dir="\"$ac_define_dir\""
AC_SUBST($1, "$ac_define_dir")
AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
eval ax_define_dir="\"[$]$2\""
eval ax_define_dir="\"$ax_define_dir\""
AC_SUBST($1, "$ax_define_dir")
AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3])
test "$prefix_NONE" && prefix=NONE
test "$exec_prefix_NONE" && exec_prefix=NONE
])

863
lib/libXpm/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

12180
lib/libXpm/configure vendored
View File

File diff suppressed because it is too large Load Diff

27
lib/libXpm/configure.ac
View File

@ -1,17 +1,23 @@
# $Id: configure.ac,v 1.1.1.2 2007/09/30 08:38:09 matthieu Exp $
AC_PREREQ(2.57)
AC_INIT([libXpm], 3.5.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXpm)
AC_INIT([libXpm], 3.5.8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXpm)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
LT_AC_PROG_SED
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XPM, xproto x11)
@ -24,22 +30,13 @@ AC_HEADER_STDC
# Checks for functions
AC_CHECK_FUNCS([strlcat])
# Checks for typedefs, structures, and compiler characteristics.
if test "x$GCC" = "xyes"; then
GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations \
-Wnested-externs -fno-strict-aliasing"
CFLAGS="$GCC_WARNINGS $CFLAGS"
fi
# Internationalization & localization support
AC_SEARCH_LIBS([gettext], [intl], [USE_GETTEXT="yes"], [USE_GETTEXT="no"])
AC_MSG_CHECKING([where to install localized messages])
AC_ARG_WITH([localedir], AC_HELP_STRING([--with-localedir=<path>],
[Path to install message files in (default: datadir/locale)]),
[LOCALEDIR=${withval}], [LOCALEDIR=${datadir}/locale])
AC_DEFINE_DIR([LOCALEDIR], [LOCALEDIR], [Location of translated messages])
AX_DEFINE_DIR([LOCALEDIR], [LOCALEDIR], [Location of translated messages])
if test "x$LOCALEDIR" = "xno" -o "x$USE_GETTEXT" = "xno" ; then
AC_MSG_RESULT([nowhere])
USE_GETTEXT="no"
@ -64,12 +61,8 @@ if test x$STAT_ZFILE = xyes ; then
fi
PKG_CHECK_MODULES(SXPM, xt xext xextproto, build_sxpm=true, build_sxpm=false)
AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
src/Makefile
sxpm/Makefile

8
lib/libXpm/cxpm/Makefile.am
View File

@ -1,7 +1,7 @@
bin_PROGRAMS = cxpm
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include/X11
AM_CFLAGS = $(XPM_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS)
cxpm_SOURCES = cxpm.c
@ -14,8 +14,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@ -36,13 +34,13 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
if USE_GETTEXT
noinst_DATA = cxpm.po
cxpm.po: $(cxpm_SOURCES:%=$(srcdir)/%)
xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%)
$(AM_V_GEN)xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%)
CLEANFILES += cxpm.po
endif

25
lib/libXpm/cxpm/Makefile.in
View File

@ -97,8 +97,10 @@ BUILD_SXPM_TRUE = @BUILD_SXPM_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -108,6 +110,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -118,6 +121,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -137,6 +141,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -147,6 +152,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -157,13 +163,9 @@ USE_GETTEXT_TRUE = @USE_GETTEXT_TRUE@
VERSION = @VERSION@
XPM_CFLAGS = @XPM_CFLAGS@
XPM_LIBS = @XPM_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -180,29 +182,37 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include/X11
AM_CFLAGS = $(XPM_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS)
cxpm_SOURCES = cxpm.c
# Man page
@ -211,7 +221,6 @@ appman_PRE = cxpm.man
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA) $(am__append_1)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@ -525,10 +534,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
@USE_GETTEXT_TRUE@cxpm.po: $(cxpm_SOURCES:%=$(srcdir)/%)
@USE_GETTEXT_TRUE@ xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%)
@USE_GETTEXT_TRUE@ $(AM_V_GEN)xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

15
lib/libXpm/cxpm/cxpm.c
View File

@ -56,9 +56,7 @@
* note that 's' could stand both for "special" and "slow" ;-)
*/
static int
sGetc(data, file)
xpmData *data;
FILE *file;
sGetc(xpmData *data, FILE *file)
{
int c = getc(data->stream.file);
if (c == '\n') {
@ -71,10 +69,7 @@ sGetc(data, file)
}
static void
sUngetc(data, c, file)
xpmData *data;
int c;
FILE *file;
sUngetc(xpmData *data, int c, FILE *file)
{
ungetc(c, data->stream.file);
if (c == '\n') {
@ -94,7 +89,7 @@ sUngetc(data, c, file)
#include "Attrib.c"
#include "Image.c"
void
static void
ErrorMessage(
int ErrorStatus,
xpmData *data)
@ -143,9 +138,7 @@ ErrorMessage(
}
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
XpmImage image;
char *filename;

286
lib/libXpm/ltmain.sh
View File

@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
VERSION=1.5.26
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# See if we are running on zsh, and set the options which allow our
# commands through without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@ -105,11 +113,19 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
if test "${LC_ALL+set}" = set; then
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
fi
if test "${LANG+set}" = set; then
save_LANG="$LANG"; LANG=C; export LANG
lt_env=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
save_$lt_var=\$$lt_var
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
$lt_var=C
export $lt_var
fi"
done
if test -n "$lt_env"; then
lt_env="env $lt_env"
fi
# Make sure IFS has a sensible default
@ -136,6 +152,8 @@ duplicate_deps=no
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
#####################################
# Shell function definitions:
@ -196,7 +214,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
$SED -n -e '1,100{
/ I /{
s,.*,import,
p
q
}
}'`
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@ -327,7 +351,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
my_xdir="$my_gentop/$my_xlib"
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
*" $my_xlib_u "*)
extracted_serial=`expr $extracted_serial + 1`
my_xlib_u=lt$extracted_serial-$my_xlib ;;
*) break ;;
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@ -454,11 +488,12 @@ do
;;
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO"
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
echo "\
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
;;
@ -755,9 +790,11 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
*.f90) xform=f90 ;;
*.[fF][09]?) xform=[fF][09]. ;;
*.for) xform=for ;;
*.java) xform=java ;;
*.obj) xform=obj ;;
*.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@ -926,7 +963,7 @@ EOF
$run $rm "$lobj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@ -998,7 +1035,7 @@ EOF
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@ -1131,6 +1168,7 @@ EOF
thread_safe=no
vinfo=
vinfo_number=no
single_module="${wl}-single_module"
func_infer_tag $base_compile
@ -1138,8 +1176,9 @@ EOF
for arg
do
case $arg in
-all-static | -static)
if test "X$arg" = "X-all-static"; then
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@ -1147,12 +1186,20 @@ EOF
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
else
;;
-static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
fi
;;
-static-libtool-libs)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
;;
esac
build_libtool_libs=no
build_old_libs=yes
break
@ -1600,7 +1647,7 @@ EOF
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@ -1608,6 +1655,11 @@ EOF
continue
;;
-multi_module)
single_module="${wl}-multi_module"
continue
;;
-module)
module=yes
continue
@ -1621,10 +1673,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
# -pg pass through profiling flag for GCC
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# -F/path gives path to uninstalled frameworks, gcc on darwin
# @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-t[45]*|-txscale*|@*)
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
@ -1652,9 +1705,9 @@ EOF
-no-install)
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows
# in order for the loader to find any dlls it needs.
# and Darwin in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
@ -1713,7 +1766,7 @@ EOF
continue
;;
-static)
-static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@ -2074,17 +2127,6 @@ EOF
;;
esac
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
if test "$linkmode,$pass" = "lib,link"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
deplibs="$tmp_deplibs"
fi
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@ -2106,7 +2148,7 @@ EOF
lib=
found=no
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@ -2122,7 +2164,12 @@ EOF
continue
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
if test "$linkmode" = lib; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
fi
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@ -2503,7 +2550,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
{ { test "$prefer_static_libs" = no ||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@ -2916,12 +2965,18 @@ EOF
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
if test -f "$path/$depdepl" ; then
if test -f "$deplibdir/$depdepl" ; then
depdepl="$deplibdir/$depdepl"
elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
else
# Can't find it, oh well...
depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@ -3069,9 +3124,10 @@ EOF
case $linkmode in
oldlib)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@ -3199,7 +3255,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
darwin|linux|osf|windows)
darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@ -3210,9 +3266,10 @@ EOF
age="0"
;;
irix|nonstopux)
current=`expr $number_major + $number_minor - 1`
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_minor"
lt_irix_increment=no
;;
esac
;;
@ -3271,7 +3328,8 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
freebsd-aout)
@ -3285,8 +3343,11 @@ EOF
;;
irix | nonstopux)
major=`expr $current - $age + 1`
if test "X$lt_irix_increment" = "Xno"; then
major=`expr $current - $age`
else
major=`expr $current - $age + 1`
fi
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
@ -3437,11 +3498,11 @@ EOF
fi
# Eliminate all temporary directories.
for path in $notinst_path; do
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
done
#for path in $notinst_path; do
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@ -3542,13 +3603,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@ -3587,9 +3647,7 @@ EOF
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@ -3621,7 +3679,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
$echo "*** make it link in! You will probably need to install it or some"
$echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@ -3907,7 +3965,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
case $archive_cmds in
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
esac
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
@ -4217,9 +4278,10 @@ EOF
;;
obj)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@ -4266,12 +4328,14 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
# -Wl from whole_archive_flag_spec
# -Wl from whole_archive_flag_spec and hope we can get by with
# turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@ -4719,16 +4783,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@ -4743,13 +4807,13 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@ -4836,7 +4900,7 @@ static const void *lt_preloaded_setup() {
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@ -4873,7 +4937,7 @@ static const void *lt_preloaded_setup() {
fi
done
relink_command="(cd `pwd`; $relink_command)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@ -5280,6 +5344,20 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
else
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@ -5422,7 +5500,7 @@ else
;;
esac
$echo >> $output "\
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
\$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@ -5608,7 +5686,7 @@ fi\
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@ -5957,9 +6035,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@ -6168,7 +6246,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@ -6345,8 +6423,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
if test ! -f "$dir/$dlname"; then
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
fi
fi
;;
@ -6410,12 +6490,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
if test "${save_LC_ALL+set}" = set; then
LC_ALL="$save_LC_ALL"; export LC_ALL
fi
if test "${save_LANG+set}" = set; then
LANG="$save_LANG"; export LANG
fi
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
fi"
done
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@ -6772,9 +6852,9 @@ The following components of LINK-COMMAND are treated specially:
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
try to export only the symbols listed in SYMFILE
try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
try to export only the symbols matching REGEX
try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@ -6788,9 +6868,11 @@ The following components of LINK-COMMAND are treated specially:
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-static do not do any dynamic linking of libtool libraries
-static do not do any dynamic linking of uninstalled libtool libraries
-static-libtool-libs
do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.

42
lib/libXpm/src/Attrib.c
View File

@ -49,10 +49,10 @@ LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, unsigned int ncolors));
* Create a colortable compatible with the old style colortable
*/
static int
CreateOldColorTable(ct, ncolors, oldct)
XpmColor *ct;
unsigned int ncolors;
XpmColor ***oldct;
CreateOldColorTable(
XpmColor *ct,
unsigned int ncolors,
XpmColor ***oldct)
{
XpmColor **colorTable, **color;
unsigned int a;
@ -72,9 +72,9 @@ CreateOldColorTable(ct, ncolors, oldct)
}
static void
FreeOldColorTable(colorTable, ncolors)
XpmColor **colorTable;
unsigned int ncolors;
FreeOldColorTable(
XpmColor **colorTable,
unsigned int ncolors)
{
unsigned int a, b;
XpmColor **color;
@ -97,9 +97,9 @@ FreeOldColorTable(colorTable, ncolors)
* Free the computed color table
*/
void
xpmFreeColorTable(colorTable, ncolors)
XpmColor *colorTable;
int ncolors;
xpmFreeColorTable(
XpmColor *colorTable,
int ncolors)
{
int a, b;
XpmColor *color;
@ -119,9 +119,9 @@ xpmFreeColorTable(colorTable, ncolors)
* Free array of extensions
*/
void
XpmFreeExtensions(extensions, nextensions)
XpmExtension *extensions;
int nextensions;
XpmFreeExtensions(
XpmExtension *extensions,
int nextensions)
{
unsigned int i, j, nlines;
XpmExtension *ext;
@ -147,7 +147,7 @@ XpmFreeExtensions(extensions, nextensions)
*/
int
XpmAttributesSize()
XpmAttributesSize(void)
{
return sizeof(XpmAttributes);
}
@ -156,8 +156,7 @@ XpmAttributesSize()
* Init returned data to free safely later on
*/
void
xpmInitAttributes(attributes)
XpmAttributes *attributes;
xpmInitAttributes(XpmAttributes *attributes)
{
if (attributes) {
attributes->pixels = NULL;
@ -184,10 +183,10 @@ xpmInitAttributes(attributes)
* Fill in the XpmAttributes with the XpmImage and the XpmInfo
*/
void
xpmSetAttributes(attributes, image, info)
XpmAttributes *attributes;
XpmImage *image;
XpmInfo *info;
xpmSetAttributes(
XpmAttributes *attributes,
XpmImage *image,
XpmInfo *info)
{
if (attributes->valuemask & XpmReturnColorTable) {
attributes->colorTable = image->colorTable;
@ -254,8 +253,7 @@ xpmSetAttributes(attributes, image, info)
* but the structure itself
*/
void
XpmFreeAttributes(attributes)
XpmAttributes *attributes;
XpmFreeAttributes(XpmAttributes *attributes)
{
if (attributes->valuemask & XpmReturnPixels && attributes->npixels) {
XpmFree(attributes->pixels);

73
lib/libXpm/src/CrBufFrI.c
View File

@ -59,12 +59,12 @@ LFUNC(ExtensionsSize, unsigned int, (XpmExtension *ext, unsigned int num));
LFUNC(CommentsSize, int, (XpmInfo *info));
int
XpmCreateBufferFromImage(display, buffer_return, image, shapeimage, attributes)
Display *display;
char **buffer_return;
XImage *image;
XImage *shapeimage;
XpmAttributes *attributes;
XpmCreateBufferFromImage(
Display *display,
char **buffer_return,
XImage *image,
XImage *shapeimage,
XpmAttributes *attributes)
{
XpmImage xpmimage;
XpmInfo info;
@ -105,10 +105,10 @@ do \
}while(0)
int
XpmCreateBufferFromXpmImage(buffer_return, image, info)
char **buffer_return;
XpmImage *image;
XpmInfo *info;
XpmCreateBufferFromXpmImage(
char **buffer_return,
XpmImage *image,
XpmInfo *info)
{
/* calculation variables */
int ErrorStatus;
@ -271,13 +271,13 @@ error:
static int
WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp)
char **dataptr;
unsigned int *data_size;
unsigned int *used_size;
XpmColor *colors;
unsigned int ncolors;
unsigned int cpp;
WriteColors(
char **dataptr,
unsigned int *data_size,
unsigned int *used_size,
XpmColor *colors,
unsigned int ncolors,
unsigned int cpp)
{
char buf[BUFSIZ] = {0};
unsigned int a, key, l;
@ -329,15 +329,15 @@ WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp)
}
static void
WritePixels(dataptr, data_size, used_size, width, height, cpp, pixels, colors)
char *dataptr;
unsigned int data_size;
unsigned int *used_size;
unsigned int width;
unsigned int height;
unsigned int cpp;
unsigned int *pixels;
XpmColor *colors;
WritePixels(
char *dataptr,
unsigned int data_size,
unsigned int *used_size,
unsigned int width,
unsigned int height,
unsigned int cpp,
unsigned int *pixels,
XpmColor *colors)
{
char *s = dataptr;
unsigned int x, y, h;
@ -372,9 +372,9 @@ WritePixels(dataptr, data_size, used_size, width, height, cpp, pixels, colors)
}
static unsigned int
ExtensionsSize(ext, num)
XpmExtension *ext;
unsigned int num;
ExtensionsSize(
XpmExtension *ext,
unsigned int num)
{
unsigned int x, y, a, size;
char **line;
@ -397,12 +397,12 @@ ExtensionsSize(ext, num)
}
static void
WriteExtensions(dataptr, data_size, used_size, ext, num)
char *dataptr;
unsigned int data_size;
unsigned int *used_size;
XpmExtension *ext;
unsigned int num;
WriteExtensions(
char *dataptr,
unsigned int data_size,
unsigned int *used_size,
XpmExtension *ext,
unsigned int num)
{
unsigned int x, y, a;
char **line;
@ -432,8 +432,7 @@ WriteExtensions(dataptr, data_size, used_size, ext, num)
}
static int
CommentsSize(info)
XpmInfo *info;
CommentsSize(XpmInfo *info)
{
int size = 0;

13
lib/libXpm/src/CrBufFrP.c
View File

@ -38,13 +38,12 @@
#include "XpmI.h"
int
XpmCreateBufferFromPixmap(display, buffer_return, pixmap, shapemask,
attributes)
Display *display;
char **buffer_return;
Pixmap pixmap;
Pixmap shapemask;
XpmAttributes *attributes;
XpmCreateBufferFromPixmap(
Display *display,
char **buffer_return,
Pixmap pixmap,
Pixmap shapemask,
XpmAttributes *attributes)
{
XImage *ximage = NULL;
XImage *shapeimage = NULL;

72
lib/libXpm/src/CrDatFrI.c
View File

@ -59,12 +59,12 @@ LFUNC(CreateExtensions, void, (char **dataptr, unsigned int data_size,
unsigned int ext_nlines));
int
XpmCreateDataFromImage(display, data_return, image, shapeimage, attributes)
Display *display;
char ***data_return;
XImage *image;
XImage *shapeimage;
XpmAttributes *attributes;
XpmCreateDataFromImage(
Display *display,
char ***data_return,
XImage *image,
XImage *shapeimage,
XpmAttributes *attributes)
{
XpmImage xpmimage;
XpmInfo info;
@ -102,10 +102,10 @@ do \
} while(0)
int
XpmCreateDataFromXpmImage(data_return, image, info)
char ***data_return;
XpmImage *image;
XpmInfo *info;
XpmCreateDataFromXpmImage(
char ***data_return,
XpmImage *image,
XpmInfo *info)
{
/* calculation variables */
int ErrorStatus;
@ -244,12 +244,12 @@ exit:
}
static int
CreateColors(dataptr, data_size, colors, ncolors, cpp)
char **dataptr;
unsigned int *data_size;
XpmColor *colors;
unsigned int ncolors;
unsigned int cpp;
CreateColors(
char **dataptr,
unsigned int *data_size,
XpmColor *colors,
unsigned int ncolors,
unsigned int cpp)
{
char buf[BUFSIZ];
unsigned int a, key, l;
@ -295,14 +295,14 @@ CreateColors(dataptr, data_size, colors, ncolors, cpp)
}
static void
CreatePixels(dataptr, data_size, width, height, cpp, pixels, colors)
char **dataptr;
unsigned int data_size;
unsigned int width;
unsigned int height;
unsigned int cpp;
unsigned int *pixels;
XpmColor *colors;
CreatePixels(
char **dataptr,
unsigned int data_size,
unsigned int width,
unsigned int height,
unsigned int cpp,
unsigned int *pixels,
XpmColor *colors)
{
char *s;
unsigned int x, y, h, offset;
@ -345,11 +345,11 @@ CreatePixels(dataptr, data_size, width, height, cpp, pixels, colors)
}
static void
CountExtensions(ext, num, ext_size, ext_nlines)
XpmExtension *ext;
unsigned int num;
unsigned int *ext_size;
unsigned int *ext_nlines;
CountExtensions(
XpmExtension *ext,
unsigned int num,
unsigned int *ext_size,
unsigned int *ext_nlines)
{
unsigned int x, y, a, size, nlines;
char **line;
@ -371,13 +371,13 @@ CountExtensions(ext, num, ext_size, ext_nlines)
}
static void
CreateExtensions(dataptr, data_size, offset, ext, num, ext_nlines)
char **dataptr;
unsigned int data_size;
unsigned int offset;
XpmExtension *ext;
unsigned int num;
unsigned int ext_nlines;
CreateExtensions(
char **dataptr,
unsigned int data_size,
unsigned int offset,
XpmExtension *ext,
unsigned int num,
unsigned int ext_nlines)
{
unsigned int x, y, a, b;
char **line;

12
lib/libXpm/src/CrDatFrP.c
View File

@ -38,12 +38,12 @@
#include "XpmI.h"
int
XpmCreateDataFromPixmap(display, data_return, pixmap, shapemask, attributes)
Display *display;
char ***data_return;
Pixmap pixmap;
Pixmap shapemask;
XpmAttributes *attributes;
XpmCreateDataFromPixmap(
Display *display,
char ***data_return,
Pixmap pixmap,
Pixmap shapemask,
XpmAttributes *attributes)
{
XImage *ximage = NULL;
XImage *shapeimage = NULL;

27
lib/libXpm/src/CrIFrBuf.c
View File

@ -40,13 +40,12 @@
LFUNC(OpenBuffer, void, (char *buffer, xpmData *mdata));
int
XpmCreateImageFromBuffer(display, buffer, image_return,
shapeimage_return, attributes)
Display *display;
char *buffer;
XImage **image_return;
XImage **shapeimage_return;
XpmAttributes *attributes;
XpmCreateImageFromBuffer(
Display *display,
char *buffer,
XImage **image_return,
XImage **shapeimage_return,
XpmAttributes *attributes)
{
XpmImage image;
XpmInfo info;
@ -83,10 +82,10 @@ XpmCreateImageFromBuffer(display, buffer, image_return,
}
int
XpmCreateXpmImageFromBuffer(buffer, image, info)
char *buffer;
XpmImage *image;
XpmInfo *info;
XpmCreateXpmImageFromBuffer(
char *buffer,
XpmImage *image,
XpmInfo *info)
{
xpmData mdata;
int ErrorStatus;
@ -108,9 +107,9 @@ XpmCreateXpmImageFromBuffer(buffer, image, info)
* open the given buffer to be read or written as an xpmData which is returned
*/
static void
OpenBuffer(buffer, mdata)
char *buffer;
xpmData *mdata;
OpenBuffer(
char *buffer,
xpmData *mdata)
{
mdata->type = XPMBUFFER;
mdata->cptr = buffer;

27
lib/libXpm/src/CrIFrDat.c
View File

@ -40,13 +40,12 @@
LFUNC(OpenArray, void, (char **data, xpmData *mdata));
int
XpmCreateImageFromData(display, data, image_return,
shapeimage_return, attributes)
Display *display;
char **data;
XImage **image_return;
XImage **shapeimage_return;
XpmAttributes *attributes;
XpmCreateImageFromData(
Display *display,
char **data,
XImage **image_return,
XImage **shapeimage_return,
XpmAttributes *attributes)
{
XpmImage image;
XpmInfo info;
@ -83,10 +82,10 @@ XpmCreateImageFromData(display, data, image_return,
}
int
XpmCreateXpmImageFromData(data, image, info)
char **data;
XpmImage *image;
XpmInfo *info;
XpmCreateXpmImageFromData(
char **data,
XpmImage *image,
XpmInfo *info)
{
xpmData mdata;
int ErrorStatus;
@ -108,9 +107,9 @@ XpmCreateXpmImageFromData(data, image, info)
* open the given array to be read or written as an xpmData which is returned
*/
static void
OpenArray(data, mdata)
char **data;
xpmData *mdata;
OpenArray(
char **data,
xpmData *mdata)
{
mdata->type = XPMARRAY;
mdata->stream.data = data;

12
lib/libXpm/src/CrIFrP.c
View File

@ -38,12 +38,12 @@
#include "XpmI.h"
void
xpmCreateImageFromPixmap(display, pixmap, ximage_return, width, height)
Display *display;
Pixmap pixmap;
XImage **ximage_return;
unsigned int *width;
unsigned int *height;
xpmCreateImageFromPixmap(
Display *display,
Pixmap pixmap,
XImage **ximage_return,
unsigned int *width,
unsigned int *height)
{
unsigned int dum;
int dummy;

15
lib/libXpm/src/CrPFrBuf.c
View File

@ -38,14 +38,13 @@
#include "XpmI.h"
int
XpmCreatePixmapFromBuffer(display, d, buffer, pixmap_return,
shapemask_return, attributes)
Display *display;
Drawable d;
char *buffer;
Pixmap *pixmap_return;
Pixmap *shapemask_return;
XpmAttributes *attributes;
XpmCreatePixmapFromBuffer(
Display *display,
Drawable d,
char *buffer,
Pixmap *pixmap_return,
Pixmap *shapemask_return,
XpmAttributes *attributes)
{
XImage *ximage, *shapeimage;
int ErrorStatus;

15
lib/libXpm/src/CrPFrDat.c
View File

@ -38,14 +38,13 @@
#include "XpmI.h"
int
XpmCreatePixmapFromData(display, d, data, pixmap_return,
shapemask_return, attributes)
Display *display;
Drawable d;
char **data;
Pixmap *pixmap_return;
Pixmap *shapemask_return;
XpmAttributes *attributes;
XpmCreatePixmapFromData(
Display *display,
Drawable d,
char **data,
Pixmap *pixmap_return,
Pixmap *shapemask_return,
XpmAttributes *attributes)
{
XImage *ximage, *shapeimage;
int ErrorStatus;

10
lib/libXpm/src/CrPFrI.c
View File

@ -38,11 +38,11 @@
#include "XpmI.h"
void
xpmCreatePixmapFromImage(display, d, ximage, pixmap_return)
Display *display;
Drawable d;
XImage *ximage;
Pixmap *pixmap_return;
xpmCreatePixmapFromImage(
Display *display,
Drawable d,
XImage *ximage,
Pixmap *pixmap_return)
{
GC gc;
XGCValues values;

6
lib/libXpm/src/Image.c
View File

@ -41,8 +41,7 @@
* Init returned data to free safely later on
*/
void
xpmInitXpmImage(image)
XpmImage *image;
xpmInitXpmImage(XpmImage *image)
{
image->ncolors = 0;
image->colorTable = NULL;
@ -53,8 +52,7 @@ xpmInitXpmImage(image)
* Free the XpmImage data which have been allocated
*/
void
XpmFreeXpmImage(image)
XpmImage *image;
XpmFreeXpmImage(XpmImage *image)
{
if (image->colorTable)
xpmFreeColorTable(image->colorTable, image->ncolors);

18
lib/libXpm/src/Info.c
View File

@ -41,8 +41,7 @@
* Init returned data to free safely later on
*/
void
xpmInitXpmInfo(info)
XpmInfo *info;
xpmInitXpmInfo(XpmInfo *info)
{
if (info) {
info->hints_cmt = NULL;
@ -57,8 +56,7 @@ xpmInitXpmInfo(info)
* Free the XpmInfo data which have been allocated
*/
void
XpmFreeXpmInfo(info)
XpmInfo *info;
XpmFreeXpmInfo(XpmInfo *info)
{
if (info) {
if (info->valuemask & XpmComments) {
@ -88,9 +86,9 @@ XpmFreeXpmInfo(info)
* Set the XpmInfo valuemask to retrieve required info
*/
void
xpmSetInfoMask(info, attributes)
XpmInfo *info;
XpmAttributes *attributes;
xpmSetInfoMask(
XpmInfo *info,
XpmAttributes *attributes)
{
info->valuemask = 0;
if (attributes->valuemask & XpmReturnInfos)
@ -103,9 +101,9 @@ xpmSetInfoMask(info, attributes)
* Fill in the XpmInfo with the XpmAttributes
*/
void
xpmSetInfo(info, attributes)
XpmInfo *info;
XpmAttributes *attributes;
xpmSetInfo(
XpmInfo *info,
XpmAttributes *attributes)
{
info->valuemask = 0;
if (attributes->valuemask & XpmInfos) {

2
lib/libXpm/src/Makefile.am
View File

@ -3,7 +3,7 @@
lib_LTLIBRARIES=libXpm.la
AM_CPPFLAGS = -I. -I$(top_srcdir)/include/X11/
AM_CFLAGS = $(XPM_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS)
libXpm_la_LDFLAGS = -version-number 4:11:0 -no-undefined
libXpm_la_LIBADD = $(XPM_LIBS)

20
lib/libXpm/src/Makefile.in
View File

@ -105,8 +105,10 @@ BUILD_SXPM_TRUE = @BUILD_SXPM_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -116,6 +118,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -126,6 +129,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -145,6 +149,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -155,6 +160,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -165,13 +171,9 @@ USE_GETTEXT_TRUE = @USE_GETTEXT_TRUE@
VERSION = @VERSION@
XPM_CFLAGS = @XPM_CFLAGS@
XPM_LIBS = @XPM_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -188,30 +190,38 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
lib_LTLIBRARIES = libXpm.la
AM_CPPFLAGS = -I. -I$(top_srcdir)/include/X11/
AM_CFLAGS = $(XPM_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS)
libXpm_la_LDFLAGS = -version-number 4:11:0 -no-undefined
libXpm_la_LIBADD = $(XPM_LIBS)
libXpm_la_SOURCES = \

6
lib/libXpm/src/RdFToBuf.c
View File

@ -59,9 +59,9 @@
#endif
int
XpmReadFileToBuffer(filename, buffer_return)
char *filename;
char **buffer_return;
XpmReadFileToBuffer(
char *filename,
char **buffer_return)
{
int fd, fcheck;
off_t len;

6
lib/libXpm/src/RdFToDat.c
View File

@ -38,9 +38,9 @@
#include "XpmI.h"
int
XpmReadFileToData(filename, data_return)
char *filename;
char ***data_return;
XpmReadFileToData(
char *filename,
char ***data_return)
{
XpmImage image;
XpmInfo info;

45
lib/libXpm/src/RdFToI.c
View File

@ -53,15 +53,19 @@
LFUNC(OpenReadFile, int, (char *filename, xpmData *mdata));
LFUNC(xpmDataClose, void, (xpmData *mdata));
FUNC(xpmPipeThrough, FILE*, (int fd,
const char *cmd,
const char *arg1,
const char *mode));
#ifndef CXPMPROG
int
XpmReadFileToImage(display, filename,
image_return, shapeimage_return, attributes)
Display *display;
char *filename;
XImage **image_return;
XImage **shapeimage_return;
XpmAttributes *attributes;
XpmReadFileToImage(
Display *display,
char *filename,
XImage **image_return,
XImage **shapeimage_return,
XpmAttributes *attributes)
{
XpmImage image;
XpmInfo info;
@ -100,10 +104,10 @@ XpmReadFileToImage(display, filename,
}
int
XpmReadFileToXpmImage(filename, image, info)
char *filename;
XpmImage *image;
XpmInfo *info;
XpmReadFileToXpmImage(
char *filename,
XpmImage *image,
XpmInfo *info)
{
xpmData mdata;
int ErrorStatus;
@ -128,11 +132,11 @@ XpmReadFileToXpmImage(filename, image, info)
#ifndef NO_ZPIPE
/* Do not depend on errno after read_through */
FILE*
xpmPipeThrough(fd, cmd, arg1, mode)
int fd;
const char* cmd;
const char* arg1;
const char* mode;
xpmPipeThrough(
int fd,
const char *cmd,
const char *arg1,
const char *mode)
{
FILE* fp;
int status, fds[2], in = 0, out = 1;
@ -190,9 +194,9 @@ fail2:
* open the given file to be read as an xpmData which is returned.
*/
static int
OpenReadFile(filename, mdata)
char *filename;
xpmData *mdata;
OpenReadFile(
char *filename,
xpmData *mdata)
{
if (!filename) {
mdata->stream.file = (stdin);
@ -263,8 +267,7 @@ OpenReadFile(filename, mdata)
* close the file related to the xpmData if any
*/
static void
xpmDataClose(mdata)
xpmData *mdata;
xpmDataClose(xpmData *mdata)
{
if (mdata->stream.file != (stdin))
fclose(mdata->stream.file);

15
lib/libXpm/src/RdFToP.c
View File

@ -38,14 +38,13 @@
#include "XpmI.h"
int
XpmReadFileToPixmap(display, d, filename, pixmap_return,
shapemask_return, attributes)
Display *display;
Drawable d;
char *filename;
Pixmap *pixmap_return;
Pixmap *shapemask_return;
XpmAttributes *attributes;
XpmReadFileToPixmap(
Display *display,
Drawable d,
char *filename,
Pixmap *pixmap_return,
Pixmap *shapemask_return,
XpmAttributes *attributes)
{
XImage *ximage, *shapeimage;
int ErrorStatus;

6
lib/libXpm/src/WrFFrBuf.c
View File

@ -40,9 +40,9 @@
#include "XpmI.h"
int
XpmWriteFileFromBuffer(filename, buffer)
char *filename;
char *buffer;
XpmWriteFileFromBuffer(
char *filename,
char *buffer)
{
int fcheck, len;
FILE *fp = fopen(filename, "w");

6
lib/libXpm/src/WrFFrDat.c
View File

@ -38,9 +38,9 @@
#include "XpmI.h"
int
XpmWriteFileFromData(filename, data)
char *filename;
char **data;
XpmWriteFileFromData(
char *filename,
char **data)
{
XpmImage image;
XpmInfo info;

69
lib/libXpm/src/WrFFrI.c
View File

@ -68,12 +68,12 @@ LFUNC(OpenWriteFile, int, (char *filename, xpmData *mdata));
LFUNC(xpmDataClose, void, (xpmData *mdata));
int
XpmWriteFileFromImage(display, filename, image, shapeimage, attributes)
Display *display;
char *filename;
XImage *image;
XImage *shapeimage;
XpmAttributes *attributes;
XpmWriteFileFromImage(
Display *display,
char *filename,
XImage *image,
XImage *shapeimage,
XpmAttributes *attributes)
{
XpmImage xpmimage;
XpmInfo info;
@ -99,10 +99,10 @@ XpmWriteFileFromImage(display, filename, image, shapeimage, attributes)
}
int
XpmWriteFileFromXpmImage(filename, image, info)
char *filename;
XpmImage *image;
XpmInfo *info;
XpmWriteFileFromXpmImage(
char *filename,
XpmImage *image,
XpmInfo *info)
{
xpmData mdata;
char *name, *dot, *s, new_name[BUFSIZ] = {0};
@ -163,11 +163,11 @@ XpmWriteFileFromXpmImage(filename, image, info)
}
static int
xpmWriteFile(file, image, name, info)
FILE *file;
XpmImage *image;
char *name;
XpmInfo *info;
xpmWriteFile(
FILE *file,
XpmImage *image,
char *name,
XpmInfo *info)
{
/* calculation variables */
unsigned int cmts, extensions;
@ -221,10 +221,10 @@ xpmWriteFile(file, image, name, info)
}
static void
WriteColors(file, colors, ncolors)
FILE *file;
XpmColor *colors;
unsigned int ncolors;
WriteColors(
FILE *file,
XpmColor *colors,
unsigned int ncolors)
{
unsigned int a, key;
char *s;
@ -245,13 +245,13 @@ WriteColors(file, colors, ncolors)
static int
WritePixels(file, width, height, cpp, pixels, colors)
FILE *file;
unsigned int width;
unsigned int height;
unsigned int cpp;
unsigned int *pixels;
XpmColor *colors;
WritePixels(
FILE *file,
unsigned int width,
unsigned int height,
unsigned int cpp,
unsigned int *pixels,
XpmColor *colors)
{
char *s, *p, *buf;
unsigned int x, y, h;
@ -289,10 +289,10 @@ WritePixels(file, width, height, cpp, pixels, colors)
}
static void
WriteExtensions(file, ext, num)
FILE *file;
XpmExtension *ext;
unsigned int num;
WriteExtensions(
FILE *file,
XpmExtension *ext,
unsigned int num)
{
unsigned int x, y, n;
char **line;
@ -318,9 +318,9 @@ FUNC(xpmPipeThrough, FILE*, (int fd,
* open the given file to be written as an xpmData which is returned
*/
static int
OpenWriteFile(filename, mdata)
char *filename;
xpmData *mdata;
OpenWriteFile(
char *filename,
xpmData *mdata)
{
if (!filename) {
mdata->stream.file = (stdout);
@ -356,8 +356,7 @@ OpenWriteFile(filename, mdata)
* close the file related to the xpmData if any
*/
static void
xpmDataClose(mdata)
xpmData *mdata;
xpmDataClose(xpmData *mdata)
{
if (mdata->stream.file != (stdout))
fclose(mdata->stream.file);

12
lib/libXpm/src/WrFFrP.c
View File

@ -38,12 +38,12 @@
#include "XpmI.h"
int
XpmWriteFileFromPixmap(display, filename, pixmap, shapemask, attributes)
Display *display;
char *filename;
Pixmap pixmap;
Pixmap shapemask;
XpmAttributes *attributes;
XpmWriteFileFromPixmap(
Display *display,
char *filename,
Pixmap pixmap,
Pixmap shapemask,
XpmAttributes *attributes)
{
XImage *ximage = NULL;
XImage *shapeimage = NULL;

417
lib/libXpm/src/create.c
View File

@ -163,8 +163,9 @@ FUNC(xpmstrcasecmp, int, (char *s1, char *s2));
* which does the trick
*/
int
xpmstrcasecmp(s1, s2)
register char *s1, *s2;
xpmstrcasecmp(
register char *s1,
register char *s2)
{
register int c1, c2;
@ -185,8 +186,7 @@ xpmstrcasecmp(s1, s2)
* return the default color key related to the given visual
*/
static int
xpmVisualType(visual)
Visual *visual;
xpmVisualType(Visual *visual)
{
#ifndef FOR_MSW
# ifndef AMIGA
@ -235,12 +235,12 @@ closeness_cmp(Const void *a, Const void *b)
* call XAllocColor and return 0 if failure, positive otherwise
*/
static int
AllocColor(display, colormap, colorname, xcolor, closure)
Display *display;
Colormap colormap;
char *colorname;
XColor *xcolor;
void *closure; /* not used */
AllocColor(
Display *display,
Colormap colormap,
char *colorname,
XColor *xcolor,
void *closure) /* not used */
{
int status;
if (colorname)
@ -258,21 +258,20 @@ AllocColor(display, colormap, colorname, xcolor, closure)
*/
static int
SetCloseColor(display, colormap, visual, col, image_pixel, mask_pixel,
alloc_pixels, nalloc_pixels, attributes, cols, ncols,
allocColor, closure)
Display *display;
Colormap colormap;
Visual *visual;
XColor *col;
Pixel *image_pixel, *mask_pixel;
Pixel *alloc_pixels;
unsigned int *nalloc_pixels;
XpmAttributes *attributes;
XColor *cols;
int ncols;
XpmAllocColorFunc allocColor;
void *closure;
SetCloseColor(
Display *display,
Colormap colormap,
Visual *visual,
XColor *col,
Pixel *image_pixel,
Pixel *mask_pixel,
Pixel *alloc_pixels,
unsigned int *nalloc_pixels,
XpmAttributes *attributes,
XColor *cols,
int ncols,
XpmAllocColorFunc allocColor,
void *closure)
{
/*
@ -443,26 +442,24 @@ SetCloseColor(display, colormap, visual, col, image_pixel, mask_pixel,
*/
static int
SetColor(display, colormap, visual, colorname, color_index,
image_pixel, mask_pixel, mask_pixel_index,
alloc_pixels, nalloc_pixels, used_pixels, nused_pixels,
attributes, cols, ncols, allocColor, closure)
Display *display;
Colormap colormap;
Visual *visual;
char *colorname;
unsigned int color_index;
Pixel *image_pixel, *mask_pixel;
unsigned int *mask_pixel_index;
Pixel *alloc_pixels;
unsigned int *nalloc_pixels;
Pixel *used_pixels;
unsigned int *nused_pixels;
XpmAttributes *attributes;
XColor *cols;
int ncols;
XpmAllocColorFunc allocColor;
void *closure;
SetColor(
Display *display,
Colormap colormap,
Visual *visual,
char *colorname,
unsigned int color_index,
Pixel *image_pixel,
Pixel *mask_pixel,
unsigned int *mask_pixel_index,
Pixel *alloc_pixels,
unsigned int *nalloc_pixels,
Pixel *used_pixels,
unsigned int *nused_pixels,
XpmAttributes *attributes,
XColor *cols,
int ncols,
XpmAllocColorFunc allocColor,
void *closure)
{
XColor xcolor;
int status;
@ -507,20 +504,18 @@ SetColor(display, colormap, visual, colorname, color_index,
static int
CreateColors(display, attributes, colors, ncolors, image_pixels, mask_pixels,
mask_pixel_index, alloc_pixels, nalloc_pixels,
used_pixels, nused_pixels)
Display *display;
XpmAttributes *attributes;
XpmColor *colors;
unsigned int ncolors;
Pixel *image_pixels;
Pixel *mask_pixels;
unsigned int *mask_pixel_index;
Pixel *alloc_pixels;
unsigned int *nalloc_pixels;
Pixel *used_pixels;
unsigned int *nused_pixels;
CreateColors(
Display *display,
XpmAttributes *attributes,
XpmColor *colors,
unsigned int ncolors,
Pixel *image_pixels,
Pixel *mask_pixels,
unsigned int *mask_pixel_index,
Pixel *alloc_pixels,
unsigned int *nalloc_pixels,
Pixel *used_pixels,
unsigned int *nused_pixels)
{
/* variables stored in the XpmAttributes structure */
Visual *visual;
@ -739,12 +734,12 @@ CreateColors(display, attributes, colors, ncolors, image_pixels, mask_pixels,
/* default FreeColors function, simply call XFreeColors */
static int
FreeColors(display, colormap, pixels, n, closure)
Display *display;
Colormap colormap;
Pixel *pixels;
int n;
void *closure; /* not used */
FreeColors(
Display *display,
Colormap colormap,
Pixel *pixels,
int n,
void *closure) /* not used */
{
return XFreeColors(display, colormap, pixels, n, 0);
}
@ -761,13 +756,12 @@ do \
} while(0)
int
XpmCreateImageFromXpmImage(display, image,
image_return, shapeimage_return, attributes)
Display *display;
XpmImage *image;
XImage **image_return;
XImage **shapeimage_return;
XpmAttributes *attributes;
XpmCreateImageFromXpmImage(
Display *display,
XpmImage *image,
XImage **image_return,
XImage **shapeimage_return,
XpmAttributes *attributes)
{
/* variables stored in the XpmAttributes structure */
Visual *visual;
@ -973,14 +967,14 @@ error:
* Create an XImage with its data
*/
static int
CreateXImage(display, visual, depth, format, width, height, image_return)
Display *display;
Visual *visual;
unsigned int depth;
int format;
unsigned int width;
unsigned int height;
XImage **image_return;
CreateXImage(
Display *display,
Visual *visual,
unsigned int depth,
int format,
unsigned int width,
unsigned int height,
XImage **image_return)
{
int bitmap_pad;
@ -1072,9 +1066,9 @@ static unsigned char Const _reverse_byte[0x100] = {
};
static int
_XReverse_Bytes(bpt, nb)
register unsigned char *bpt;
register unsigned int nb;
_XReverse_Bytes(
register unsigned char *bpt,
register unsigned int nb)
{
do {
*bpt = _reverse_byte[*bpt];
@ -1085,9 +1079,9 @@ _XReverse_Bytes(bpt, nb)
void
xpm_xynormalizeimagebits(bp, img)
register unsigned char *bp;
register XImage *img;
xpm_xynormalizeimagebits(
register unsigned char *bp,
register XImage *img)
{
register unsigned char c;
@ -1115,9 +1109,9 @@ xpm_xynormalizeimagebits(bp, img)
}
void
xpm_znormalizeimagebits(bp, img)
register unsigned char *bp;
register XImage *img;
xpm_znormalizeimagebits(
register unsigned char *bp,
register XImage *img)
{
register unsigned char c;
@ -1160,13 +1154,13 @@ static unsigned char Const _himask[0x09] = {
0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00};
static void
_putbits(src, dstoffset, numbits, dst)
register char *src; /* address of source bit string */
int dstoffset; /* bit offset into destination;
_putbits(
register char *src, /* address of source bit string */
int dstoffset, /* bit offset into destination;
* range is 0-31 */
register int numbits; /* number of bits to copy to
register int numbits, /* number of bits to copy to
* destination */
register char *dst; /* address of destination bit string */
register char *dst) /* address of destination bit string */
{
register unsigned char chlo, chhi;
int hibits;
@ -1208,12 +1202,12 @@ _putbits(src, dstoffset, numbits, dst)
*/
static void
PutImagePixels(image, width, height, pixelindex, pixels)
XImage *image;
unsigned int width;
unsigned int height;
unsigned int *pixelindex;
Pixel *pixels;
PutImagePixels(
XImage *image,
unsigned int width,
unsigned int height,
unsigned int *pixelindex,
Pixel *pixels)
{
register char *src;
register char *dst;
@ -1295,12 +1289,12 @@ static unsigned long byteorderpixel = MSBFirst << 24;
*/
static void
PutImagePixels32(image, width, height, pixelindex, pixels)
XImage *image;
unsigned int width;
unsigned int height;
unsigned int *pixelindex;
Pixel *pixels;
PutImagePixels32(
XImage *image,
unsigned int width,
unsigned int height,
unsigned int *pixelindex,
Pixel *pixels)
{
unsigned char *data;
unsigned int *iptr;
@ -1405,12 +1399,12 @@ PutImagePixels32(image, width, height, pixelindex, pixels)
*/
static void
PutImagePixels16(image, width, height, pixelindex, pixels)
XImage *image;
unsigned int width;
unsigned int height;
unsigned int *pixelindex;
Pixel *pixels;
PutImagePixels16(
XImage *image,
unsigned int width,
unsigned int height,
unsigned int *pixelindex,
Pixel *pixels)
{
unsigned char *data;
unsigned int *iptr;
@ -1486,12 +1480,12 @@ PutImagePixels16(image, width, height, pixelindex, pixels)
*/
static void
PutImagePixels8(image, width, height, pixelindex, pixels)
XImage *image;
unsigned int width;
unsigned int height;
unsigned int *pixelindex;
Pixel *pixels;
PutImagePixels8(
XImage *image,
unsigned int width,
unsigned int height,
unsigned int *pixelindex,
Pixel *pixels)
{
char *data;
unsigned int *iptr;
@ -1533,12 +1527,12 @@ PutImagePixels8(image, width, height, pixelindex, pixels)
*/
static void
PutImagePixels1(image, width, height, pixelindex, pixels)
XImage *image;
unsigned int width;
unsigned int height;
unsigned int *pixelindex;
Pixel *pixels;
PutImagePixels1(
XImage *image,
unsigned int width,
unsigned int height,
unsigned int *pixelindex,
Pixel *pixels)
{
if (image->byte_order != image->bitmap_bit_order)
PutImagePixels(image, width, height, pixelindex, pixels);
@ -1647,14 +1641,13 @@ PutImagePixels1(image, width, height, pixelindex, pixels)
}
int
XpmCreatePixmapFromXpmImage(display, d, image,
pixmap_return, shapemask_return, attributes)
Display *display;
Drawable d;
XpmImage *image;
Pixmap *pixmap_return;
Pixmap *shapemask_return;
XpmAttributes *attributes;
XpmCreatePixmapFromXpmImage(
Display *display,
Drawable d,
XpmImage *image,
Pixmap *pixmap_return,
Pixmap *shapemask_return,
XpmAttributes *attributes)
{
XImage *ximage, *shapeimage;
int ErrorStatus;
@ -1732,13 +1725,13 @@ APutImagePixels (
# endif/* AMIGA */
#else /* FOR_MSW part follows */
static void
MSWPutImagePixels(dc, image, width, height, pixelindex, pixels)
Display *dc;
XImage *image;
unsigned int width;
unsigned int height;
unsigned int *pixelindex;
Pixel *pixels;
MSWPutImagePixels(
Display *dc,
XImage *image,
unsigned int width,
unsigned int height,
unsigned int *pixelindex,
Pixel *pixels)
{
unsigned int *data = pixelindex;
unsigned int x, y;
@ -1760,11 +1753,11 @@ MSWPutImagePixels(dc, image, width, height, pixelindex, pixels)
#if !defined(FOR_MSW) && !defined(AMIGA)
static int
PutPixel1(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel1(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
register char *src;
register char *dst;
@ -1795,11 +1788,11 @@ PutPixel1(ximage, x, y, pixel)
}
static int
PutPixel(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
register char *src;
register char *dst;
@ -1834,11 +1827,11 @@ PutPixel(ximage, x, y, pixel)
#if !defined(WORD64) && !defined(LONG64)
static int
PutPixel32(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel32(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
unsigned char *addr;
@ -1852,11 +1845,11 @@ PutPixel32(ximage, x, y, pixel)
#endif
static int
PutPixel32MSB(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel32MSB(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
unsigned char *addr;
@ -1872,11 +1865,11 @@ PutPixel32MSB(ximage, x, y, pixel)
}
static int
PutPixel32LSB(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel32LSB(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
unsigned char *addr;
@ -1892,11 +1885,11 @@ PutPixel32LSB(ximage, x, y, pixel)
}
static int
PutPixel16MSB(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel16MSB(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
unsigned char *addr;
@ -1910,11 +1903,11 @@ PutPixel16MSB(ximage, x, y, pixel)
}
static int
PutPixel16LSB(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel16LSB(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
unsigned char *addr;
@ -1928,11 +1921,11 @@ PutPixel16LSB(ximage, x, y, pixel)
}
static int
PutPixel8(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel8(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
if(x < 0 || y < 0)
return 0;
@ -1942,11 +1935,11 @@ PutPixel8(ximage, x, y, pixel)
}
static int
PutPixel1MSB(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel1MSB(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
if(x < 0 || y < 0)
return 0;
@ -1959,11 +1952,11 @@ PutPixel1MSB(ximage, x, y, pixel)
}
static int
PutPixel1LSB(ximage, x, y, pixel)
register XImage *ximage;
int x;
int y;
unsigned long pixel;
PutPixel1LSB(
register XImage *ximage,
int x,
int y,
unsigned long pixel)
{
if(x < 0 || y < 0)
return 0;
@ -1981,15 +1974,14 @@ PutPixel1LSB(ximage, x, y, pixel)
* This function parses an Xpm file or data and directly create an XImage
*/
int
xpmParseDataAndCreate(display, data, image_return, shapeimage_return,
image, info, attributes)
Display *display;
xpmData *data;
XImage **image_return;
XImage **shapeimage_return;
XpmImage *image;
XpmInfo *info;
XpmAttributes *attributes;
xpmParseDataAndCreate(
Display *display,
xpmData *data,
XImage **image_return,
XImage **shapeimage_return,
XpmImage *image,
XpmInfo *info,
XpmAttributes *attributes)
{
/* variables stored in the XpmAttributes structure */
Visual *visual;
@ -2320,24 +2312,19 @@ error:
static int
ParseAndPutPixels(
#ifdef FOR_MSW
dc,
Display *dc,
#endif
data, width, height, ncolors, cpp, colorTable, hashtable,
image, image_pixels, shapeimage, shape_pixels)
#ifdef FOR_MSW
Display *dc;
#endif
xpmData *data;
unsigned int width;
unsigned int height;
unsigned int ncolors;
unsigned int cpp;
XpmColor *colorTable;
xpmHashTable *hashtable;
XImage *image;
Pixel *image_pixels;
XImage *shapeimage;
Pixel *shape_pixels;
xpmData *data,
unsigned int width,
unsigned int height,
unsigned int ncolors,
unsigned int cpp,
XpmColor *colorTable,
xpmHashTable *hashtable,
XImage *image,
Pixel *image_pixels,
XImage *shapeimage,
Pixel *shape_pixels)
{
unsigned int a, x, y;

34
lib/libXpm/src/data.c
View File

@ -182,8 +182,7 @@ ParseComment(xpmData *data)
* skip to the end of the current string and the beginning of the next one
*/
int
xpmNextString(data)
xpmData *data;
xpmNextString(xpmData *data)
{
if (!data->type)
data->cptr = (data->stream.data)[++data->line];
@ -238,10 +237,10 @@ xpmNextString(data)
* skip whitespace and return the following word
*/
unsigned int
xpmNextWord(data, buf, buflen)
xpmData *data;
char *buf;
unsigned int buflen;
xpmNextWord(
xpmData *data,
char *buf,
unsigned int buflen)
{
register unsigned int n = 0;
int c;
@ -275,9 +274,9 @@ xpmNextWord(data, buf, buflen)
* returns 1 if one is found and 0 if not
*/
int
xpmNextUI(data, ui_return)
xpmData *data;
unsigned int *ui_return;
xpmNextUI(
xpmData *data,
unsigned int *ui_return)
{
char buf[BUFSIZ];
int l;
@ -290,10 +289,10 @@ xpmNextUI(data, ui_return)
* return end of string - WARNING: malloc!
*/
int
xpmGetString(data, sptr, l)
xpmData *data;
char **sptr;
unsigned int *l;
xpmGetString(
xpmData *data,
char **sptr,
unsigned int *l)
{
unsigned int i, n = 0;
int c;
@ -374,9 +373,9 @@ xpmGetString(data, sptr, l)
* get the current comment line
*/
int
xpmGetCmt(data, cmt)
xpmData *data;
char **cmt;
xpmGetCmt(
xpmData *data,
char **cmt)
{
if (!data->type)
*cmt = NULL;
@ -403,8 +402,7 @@ xpmDataType xpmDataTypes[] =
* parse xpm header
*/
int
xpmParseHeader(data)
xpmData *data;
xpmParseHeader(xpmData *data)
{
char buf[BUFSIZ+1] = {0};
int l, n = 0;

29
lib/libXpm/src/hashtab.c
View File

@ -42,9 +42,9 @@ LFUNC(AtomMake, xpmHashAtom, (char *name, void *data));
LFUNC(HashTableGrows, int, (xpmHashTable * table));
static xpmHashAtom
AtomMake(name, data) /* makes an atom */
char *name; /* WARNING: is just pointed to */
void *data;
AtomMake( /* makes an atom */
char *name, /* WARNING: is just pointed to */
void *data)
{
xpmHashAtom object = (xpmHashAtom) XpmMalloc(sizeof(struct _xpmHashAtom));
@ -107,9 +107,9 @@ AtomMake(name, data) /* makes an atom */
*/
xpmHashAtom *
xpmHashSlot(table, s)
xpmHashTable *table;
char *s;
xpmHashSlot(
xpmHashTable *table,
char *s)
{
xpmHashAtom *atomTable = table->atomTable;
unsigned int hash;
@ -134,8 +134,7 @@ xpmHashSlot(table, s)
}
static int
HashTableGrows(table)
xpmHashTable *table;
HashTableGrows(xpmHashTable *table)
{
xpmHashAtom *atomTable = table->atomTable;
unsigned int size = table->size;
@ -171,10 +170,10 @@ HashTableGrows(table)
*/
int
xpmHashIntern(table, tag, data)
xpmHashTable *table;
char *tag;
void *data;
xpmHashIntern(
xpmHashTable *table,
char *tag,
void *data)
{
xpmHashAtom *slot;
@ -200,8 +199,7 @@ xpmHashIntern(table, tag, data)
*/
int
xpmHashTableInit(table)
xpmHashTable *table;
xpmHashTableInit(xpmHashTable *table)
{
xpmHashAtom *p;
xpmHashAtom *atomTable;
@ -226,8 +224,7 @@ xpmHashTableInit(table)
*/
void
xpmHashTableFree(table)
xpmHashTable *table;
xpmHashTableFree(xpmHashTable *table)
{
xpmHashAtom *p;
xpmHashAtom *atomTable = table->atomTable;

19
lib/libXpm/src/misc.c
View File

@ -43,8 +43,7 @@
* which does the trick
*/
char *
xpmstrdup(s1)
char *s1;
xpmstrdup(char *s1)
{
char *s2;
size_t l = strlen(s1) + 1;
@ -57,10 +56,10 @@ xpmstrdup(s1)
#endif
unsigned int
xpmatoui(p, l, ui_return)
register char *p;
unsigned int l;
unsigned int *ui_return;
xpmatoui(
register char *p,
unsigned int l,
unsigned int *ui_return)
{
register unsigned int n, i;
@ -82,8 +81,7 @@ xpmatoui(p, l, ui_return)
* Function returning a character string related to an error code.
*/
char *
XpmGetErrorString(errcode)
int errcode;
XpmGetErrorString(int errcode)
{
switch (errcode) {
case XpmColorError:
@ -108,7 +106,7 @@ XpmGetErrorString(errcode)
* newer or older than the one with which a program has been first compiled.
*/
int
XpmLibraryVersion()
XpmLibraryVersion(void)
{
return XpmIncludeVersion;
}
@ -120,8 +118,7 @@ XpmLibraryVersion()
#endif
void
XpmFree(ptr)
void *ptr;
XpmFree(void *ptr)
{
free(ptr);
}

62
lib/libXpm/src/parse.c
View File

@ -82,12 +82,16 @@ char *xpmColorKeys[] = {
};
int
xpmParseValues(data, width, height, ncolors, cpp,
x_hotspot, y_hotspot, hotspot, extensions)
xpmData *data;
unsigned int *width, *height, *ncolors, *cpp;
unsigned int *x_hotspot, *y_hotspot, *hotspot;
unsigned int *extensions;
xpmParseValues(
xpmData *data,
unsigned int *width,
unsigned int *height,
unsigned int *ncolors,
unsigned int *cpp,
unsigned int *x_hotspot,
unsigned int *y_hotspot,
unsigned int *hotspot,
unsigned int *extensions)
{
unsigned int l;
char buf[BUFSIZ + 1];
@ -192,12 +196,12 @@ xpmParseValues(data, width, height, ncolors, cpp,
}
int
xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable)
xpmData *data;
unsigned int ncolors;
unsigned int cpp;
XpmColor **colorTablePtr;
xpmHashTable *hashtable;
xpmParseColors(
xpmData *data,
unsigned int ncolors,
unsigned int cpp,
XpmColor **colorTablePtr,
xpmHashTable *hashtable)
{
unsigned int key = 0, l, a, b, len;
unsigned int curkey; /* current color key */
@ -365,15 +369,15 @@ xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable)
}
static int
ParsePixels(data, width, height, ncolors, cpp, colorTable, hashtable, pixels)
xpmData *data;
unsigned int width;
unsigned int height;
unsigned int ncolors;
unsigned int cpp;
XpmColor *colorTable;
xpmHashTable *hashtable;
unsigned int **pixels;
ParsePixels(
xpmData *data,
unsigned int width,
unsigned int height,
unsigned int ncolors,
unsigned int cpp,
XpmColor *colorTable,
xpmHashTable *hashtable,
unsigned int **pixels)
{
unsigned int *iptr, *iptr2 = NULL; /* found by Egbert Eich */
unsigned int a, x, y;
@ -538,10 +542,10 @@ do \
}
int
xpmParseExtensions(data, extensions, nextensions)
xpmData *data;
XpmExtension **extensions;
unsigned int *nextensions;
xpmParseExtensions(
xpmData *data,
XpmExtension **extensions,
unsigned int *nextensions)
{
XpmExtension *exts = NULL, *ext;
unsigned int num = 0;
@ -659,10 +663,10 @@ do { \
* in an an XpmImage structure which is returned.
*/
int
xpmParseData(data, image, info)
xpmData *data;
XpmImage *image;
XpmInfo *info;
xpmParseData(
xpmData *data,
XpmImage *image,
XpmInfo *info)
{
/* variables to return */
unsigned int width, height, ncolors, cpp;

58
lib/libXpm/src/rgb.c
View File

@ -56,10 +56,9 @@
* number of entries stored.
*/
int
xpmReadRgbNames(rgb_fname, rgbn)
char *rgb_fname;
xpmRgbName rgbn[];
xpmReadRgbNames(
char *rgb_fname,
xpmRgbName rgbn[])
{
FILE *rgbf;
int n, items, red, green, blue;
@ -118,11 +117,12 @@ xpmReadRgbNames(rgb_fname, rgbn)
* Return the color name corresponding to the given rgb values
*/
char *
xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
xpmRgbName rgbn[]; /* rgb mnemonics from rgb text file */
int rgbn_max; /* number of rgb mnemonics in table */
int red, green, blue; /* rgb values */
xpmGetRgbName(
xpmRgbName rgbn[], /* rgb mnemonics from rgb text file */
int rgbn_max, /* number of rgb mnemonics in table */
int red, /* rgb values */
int green,
int blue)
{
int i;
xpmRgbName *rgb;
@ -144,10 +144,9 @@ xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
* Free the strings which have been malloc'ed in xpmReadRgbNames
*/
void
xpmFreeRgbNames(rgbn, rgbn_max)
xpmRgbName rgbn[];
int rgbn_max;
xpmFreeRgbNames(
xpmRgbName rgbn[],
int rgbn_max)
{
int i;
xpmRgbName *rgb;
@ -162,9 +161,9 @@ xpmFreeRgbNames(rgbn, rgbn_max)
#include "rgbtab.h" /* hard coded rgb.txt table */
int
xpmReadRgbNames(rgb_fname, rgbn)
char *rgb_fname;
xpmRgbName rgbn[];
xpmReadRgbNames(
char *rgb_fname,
xpmRgbName rgbn[])
{
/*
* check for consistency???
@ -178,11 +177,13 @@ xpmReadRgbNames(rgb_fname, rgbn)
* which has something like #0303 for one color
*/
char *
xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
xpmRgbName rgbn[]; /* rgb mnemonics from rgb text file
* not used */
int rgbn_max; /* not used */
int red, green, blue; /* rgb values */
xpmGetRgbName(
xpmRgbName rgbn[], /* rgb mnemonics from rgb text file
* not used */
int rgbn_max, /* not used */
int red, /* rgb values */
int green,
int blue)
{
int i;
@ -202,9 +203,11 @@ xpmGetRgbName(rgbn, rgbn_max, red, green, blue)
/* used in XParseColor in simx.c */
int
xpmGetRGBfromName(inname, r, g, b)
char *inname;
int *r, *g, *b;
xpmGetRGBfromName(
char *inname,
int *r,
int *g,
int *b)
{
int left, right, middle;
int cmp;
@ -274,10 +277,9 @@ xpmGetRGBfromName(inname, r, g, b)
}
void
xpmFreeRgbNames(rgbn, rgbn_max)
xpmRgbName rgbn[];
int rgbn_max;
xpmFreeRgbNames(
xpmRgbName rgbn[],
int rgbn_max)
{
/* nothing to do */
}

134
lib/libXpm/src/scan.c
View File

@ -122,10 +122,10 @@ LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors,
* if not large enough.
*/
static int
storePixel(pixel, pmap, index_return)
Pixel pixel;
PixelsMap *pmap;
unsigned int *index_return;
storePixel(
Pixel pixel,
PixelsMap *pmap,
unsigned int *index_return)
{
unsigned int i;
Pixel *p;
@ -157,10 +157,10 @@ storePixel(pixel, pmap, index_return)
}
static int
storeMaskPixel(pixel, pmap, index_return)
Pixel pixel;
PixelsMap *pmap;
unsigned int *index_return;
storeMaskPixel(
Pixel pixel,
PixelsMap *pmap,
unsigned int *index_return)
{
if (!pixel) {
if (!pmap->ncolors) {
@ -187,13 +187,12 @@ do { \
* the given XpmImage structure.
*/
int
XpmCreateXpmImageFromImage(display, image, shapeimage,
xpmimage, attributes)
Display *display;
XImage *image;
XImage *shapeimage;
XpmImage *xpmimage;
XpmAttributes *attributes;
XpmCreateXpmImageFromImage(
Display *display,
XImage *image,
XImage *shapeimage,
XpmImage *xpmimage,
XpmAttributes *attributes)
{
/* variables stored in the XpmAttributes structure */
unsigned int cpp;
@ -363,10 +362,10 @@ error:
}
static int
ScanTransparentColor(color, cpp, attributes)
XpmColor *color;
unsigned int cpp;
XpmAttributes *attributes;
ScanTransparentColor(
XpmColor *color,
unsigned int cpp,
XpmAttributes *attributes)
{
char *s;
unsigned int a, b, c;
@ -419,14 +418,14 @@ ScanTransparentColor(color, cpp, attributes)
}
static int
ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
Display *display;
XpmColor *colors;
unsigned int ncolors;
Pixel *pixels;
unsigned int mask;
unsigned int cpp;
XpmAttributes *attributes;
ScanOtherColors(
Display *display,
XpmColor *colors,
unsigned int ncolors,
Pixel *pixels,
unsigned int mask,
unsigned int cpp,
XpmAttributes *attributes)
{
/* variables stored in the XpmAttributes structure */
Colormap colormap;
@ -614,11 +613,11 @@ static unsigned long Const low_bits_table[] = {
*/
static int
GetImagePixels(image, width, height, pmap)
XImage *image;
unsigned int width;
unsigned int height;
PixelsMap *pmap;
GetImagePixels(
XImage *image,
unsigned int width,
unsigned int height,
PixelsMap *pmap)
{
char *src;
char *dst;
@ -720,11 +719,11 @@ static unsigned long byteorderpixel = MSBFirst << 24;
#endif
static int
GetImagePixels32(image, width, height, pmap)
XImage *image;
unsigned int width;
unsigned int height;
PixelsMap *pmap;
GetImagePixels32(
XImage *image,
unsigned int width,
unsigned int height,
PixelsMap *pmap)
{
unsigned char *addr;
unsigned char *data;
@ -785,11 +784,11 @@ GetImagePixels32(image, width, height, pmap)
*/
static int
GetImagePixels16(image, width, height, pmap)
XImage *image;
unsigned int width;
unsigned int height;
PixelsMap *pmap;
GetImagePixels16(
XImage *image,
unsigned int width,
unsigned int height,
PixelsMap *pmap)
{
unsigned char *addr;
unsigned char *data;
@ -831,11 +830,11 @@ GetImagePixels16(image, width, height, pmap)
*/
static int
GetImagePixels8(image, width, height, pmap)
XImage *image;
unsigned int width;
unsigned int height;
PixelsMap *pmap;
GetImagePixels8(
XImage *image,
unsigned int width,
unsigned int height,
PixelsMap *pmap)
{
unsigned int *iptr;
unsigned char *data;
@ -864,12 +863,12 @@ GetImagePixels8(image, width, height, pmap)
*/
static int
GetImagePixels1(image, width, height, pmap, storeFunc)
XImage *image;
unsigned int width;
unsigned int height;
PixelsMap *pmap;
storeFuncPtr storeFunc;
GetImagePixels1(
XImage *image,
unsigned int width,
unsigned int height,
PixelsMap *pmap,
storeFuncPtr storeFunc)
{
unsigned int *iptr;
unsigned int x, y;
@ -920,7 +919,7 @@ AGetImagePixels (
unsigned int width,
unsigned int height,
PixelsMap *pmap,
int (*storeFunc) ())
int (*storeFunc) (Pixel, PixelsMap *, unsigned int *))
{
unsigned int *iptr;
unsigned int x, y;
@ -954,13 +953,13 @@ AGetImagePixels (
# endif/* AMIGA */
#else /* ndef FOR_MSW */
static int
MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
Display *display;
XImage *image;
unsigned int width;
unsigned int height;
PixelsMap *pmap;
int (*storeFunc) ();
MSWGetImagePixels(
Display *display,
XImage *image,
unsigned int width,
unsigned int height,
PixelsMap *pmap,
int (*storeFunc) (Pixel, PixelsMap*, unsigned int *))
{
unsigned int *iptr;
unsigned int x, y;
@ -984,13 +983,12 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
#ifndef FOR_MSW
# ifndef AMIGA
int
XpmCreateXpmImageFromPixmap(display, pixmap, shapemask,
xpmimage, attributes)
Display *display;
Pixmap pixmap;
Pixmap shapemask;
XpmImage *xpmimage;
XpmAttributes *attributes;
XpmCreateXpmImageFromPixmap(
Display *display,
Pixmap pixmap,
Pixmap shapemask,
XpmImage *xpmimage,
XpmAttributes *attributes)
{
XImage *ximage = NULL;
XImage *shapeimage = NULL;

8
lib/libXpm/sxpm/Makefile.am
View File

@ -2,7 +2,7 @@ if BUILD_SXPM
bin_PROGRAMS = sxpm
AM_CFLAGS = $(SXPM_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(SXPM_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
@ -18,8 +18,6 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@ -40,13 +38,13 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
if USE_GETTEXT
noinst_DATA = sxpm.po
sxpm.po: $(sxpm_SOURCES:%=$(srcdir)/%)
xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%)
$(AM_V_GEN)xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%)
CLEANFILES += sxpm.po
endif

25
lib/libXpm/sxpm/Makefile.in
View File

@ -101,8 +101,10 @@ BUILD_SXPM_TRUE = @BUILD_SXPM_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -112,6 +114,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -122,6 +125,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -141,6 +145,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -151,6 +156,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -161,13 +167,9 @@ USE_GETTEXT_TRUE = @USE_GETTEXT_TRUE@
VERSION = @VERSION@
XPM_CFLAGS = @XPM_CFLAGS@
XPM_LIBS = @XPM_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -184,28 +186,36 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@BUILD_SXPM_TRUE@AM_CFLAGS = $(SXPM_CFLAGS)
@BUILD_SXPM_TRUE@AM_CFLAGS = $(CWARNFLAGS) $(SXPM_CFLAGS)
@BUILD_SXPM_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
@BUILD_SXPM_TRUE@sxpm_SOURCES = sxpm.c
@BUILD_SXPM_TRUE@sxpm_LDADD = $(XPM_LIBS) $(SXPM_LIBS) $(top_builddir)/src/libXpm.la
@ -215,7 +225,6 @@ target_alias = @target_alias@
@BUILD_SXPM_TRUE@appman_PRE = sxpm.man
@BUILD_SXPM_TRUE@appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
@BUILD_SXPM_TRUE@CLEANFILES = $(appman_DATA) $(am__append_1)
@BUILD_SXPM_TRUE@SED = sed
# Strings to replace in man pages
@BUILD_SXPM_TRUE@XORGRELSTRING = @PACKAGE_STRING@
@ -535,10 +544,10 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
@BUILD_SXPM_TRUE@.man.$(APP_MAN_SUFFIX):
@BUILD_SXPM_TRUE@ sed $(MAN_SUBSTS) < $< > $@
@BUILD_SXPM_TRUE@ $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
@BUILD_SXPM_TRUE@@USE_GETTEXT_TRUE@sxpm.po: $(sxpm_SOURCES:%=$(srcdir)/%)
@BUILD_SXPM_TRUE@@USE_GETTEXT_TRUE@ xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%)
@BUILD_SXPM_TRUE@@USE_GETTEXT_TRUE@ $(AM_V_GEN)xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

55
lib/libXpm/sxpm/sxpm.c
View File

@ -110,16 +110,14 @@ static char *plaid[] = {
#define xrdb XtDatabase(dpy)
static Colormap colormap;
void Usage();
void ErrorMessage();
void Punt();
void VersionInfo();
#ifdef __STDC__
void Usage(void);
void ErrorMessage(int ErrorStatus, char *tag);
void Punt(int i);
void VersionInfo(void);
void kinput(Widget widget, char *tag, XEvent *xe, Boolean *b);
#else
void kinput();
#endif
void GetNumbers(int num, int *format_return,
int *libmajor_return,
char *libminor_return);
#define IWIDTH 50
#define IHEIGHT 50
@ -139,9 +137,9 @@ static XrmOptionDescRec options[] = {
};
int
main(argc, argv)
int argc;
char **argv;
main(
int argc,
char **argv)
{
int ErrorStatus;
unsigned int verbose = 0; /* performs verbose output */
@ -578,7 +576,7 @@ main(argc, argv)
}
void
Usage()
Usage(void)
{
/* L10N_Comments : Usage message (sxpm -h) in two parts.
In the first part %s is replaced by the command name. */
@ -616,9 +614,9 @@ if no input is specified sxpm reads from standard input.\n\
void
ErrorMessage(ErrorStatus, tag)
int ErrorStatus;
char *tag;
ErrorMessage(
int ErrorStatus,
char *tag)
{
char *error = NULL;
char *warning = NULL;
@ -674,8 +672,7 @@ ErrorMessage(ErrorStatus, tag)
}
void
Punt(i)
int i;
Punt(int i)
{
if (icon.pixmap) {
XFreePixmap(dpy, icon.pixmap);
@ -703,11 +700,11 @@ Punt(i)
}
void
kinput(widget, tag, xe, b)
Widget widget;
char *tag;
XEvent *xe;
Boolean *b;
kinput(
Widget widget,
char *tag,
XEvent *xe,
Boolean *b)
{
char c = '\0';
@ -721,11 +718,11 @@ kinput(widget, tag, xe, b)
* number (following the rule described in xpm.h).
*/
void
GetNumbers(num, format_return, libmajor_return, libminor_return)
int num;
int *format_return;
int *libmajor_return;
char *libminor_return;
GetNumbers(
int num,
int *format_return,
int *libmajor_return,
char *libminor_return)
{
*format_return = num / 10000;
*libmajor_return = (num % 10000) / 100;
@ -733,7 +730,7 @@ GetNumbers(num, format_return, libmajor_return, libminor_return)
}
void
VersionInfo()
VersionInfo(void)
{
int format, libmajor;
char libminor;