.gitignore | 11 COPYING | 1 ChangeLog | 206 INSTALL | 236 Makefile.am | 9 Makefile.in | 712 README | 58 acinclude.m4 | 42 aclocal.m4 | 7885 --------- compile | 142 config.guess | 1500 - config.h.in | 70 config.sub | 1608 - configure |21523 ------------------------- configure.ac | 53 debian/changelog | 19 debian/control | 14 debian/patches/01_use_extern_C_in_headers.diff | 523 debian/patches/series | 1 debian/rules | 23 depcomp | 530 include/.gitignore | 2 include/Makefile.in | 487 include/X11/.gitignore | 2 include/X11/CallbackI.h | 4 include/X11/Composite.h | 2 include/X11/CompositeP.h | 4 include/X11/ConstrainP.h | 4 include/X11/Constraint.h | 6 include/X11/ConvertI.h | 3 include/X11/Core.h | 6 include/X11/CoreP.h | 4 include/X11/CreateI.h | 7 include/X11/EventI.h | 4 include/X11/HookObjI.h | 4 include/X11/InitialI.h | 4 include/X11/IntrinsicI.h | 4 include/X11/Object.h | 7 include/X11/ObjectP.h | 4 include/X11/PassivGraI.h | 4 include/X11/RectObj.h | 7 include/X11/RectObjP.h | 4 include/X11/ResourceI.h | 3 include/X11/ShellP.h | 8 include/X11/ThreadsI.h | 6 include/X11/TranslateI.h | 3 include/X11/VarargsI.h | 4 include/X11/Vendor.h | 4 include/X11/VendorP.h | 4 install-sh | 323 ltmain.sh | 6871 ------- man/.gitignore | 3 man/Makefile.in | 1124 - man/XtGetErrorDatabase.man | 5 man/XtResolvePathname.man | 2 missing | 360 mkinstalldirs | 158 src/.gitignore | 7 src/Composite.c | 3 src/Constraint.c | 1 src/Converters.c | 6 src/Core.c | 2 src/Create.c | 3 src/Display.c | 4 src/Initialize.c | 14 src/Intrinsic.c | 21 src/Keyboard.c | 2 src/Makefile.am | 2 src/Makefile.in | 648 src/NextEvent.c | 5 src/Object.c | 1 src/RectObj.c | 1 src/ResConfig.c | 1 src/Selection.c | 18 src/SetValues.c | 2 src/Shell.c | 4 src/TMkey.c | 5 src/TMparse.c | 3 src/TMprint.c | 12 src/Vendor.c | 4 util/.gitignore | 8 util/Makefile.am | 2 util/Makefile.in | 549 util/makestrs.man | 12 84 files changed, 579 insertions(+), 45378 deletions(-)
New commits: commit 8e20962ba4f803a8d959ef794a3405fe5a5808aa Author: Julien Cristau <[email protected]> Date: Tue Aug 25 19:21:23 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index ad26387..4da1719 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxt (1:1.0.6-1) UNRELEASED; urgency=low +libxt (1:1.0.6-1) unstable; urgency=low [ Julien Cristau ] * New upstream release. @@ -37,7 +37,7 @@ libxt (1:1.0.6-1) UNRELEASED; urgency=low * Drop -Wl,-Bsymbolic-functions from LDFLAGS as it conflicts with the Xt inheritance mechanism; LP: #343574. - -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 12:52:35 +0200 + -- Julien Cristau <[email protected]> Tue, 25 Aug 2009 19:19:46 +0200 libxt (1:1.0.5-3) unstable; urgency=low commit dc0f6cffa268f324c1a4c3eea70a5d44b7961af9 Author: Julien Cristau <[email protected]> Date: Tue Aug 25 19:18:09 2009 +0200 Update changelog for cherry-pick diff --git a/debian/changelog b/debian/changelog index 657d3f3..ad26387 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ libxt (1:1.0.6-1) UNRELEASED; urgency=low * Stop passing "-include X11/XlibConf.h" in CFLAGS; this was a hack introduced in 1:0.99.0+cvs.20050803-1, and unneeded since the upstream fix on Sep 24, 2005. + * Cherry-pick patch from upstream git to link against libICE. [ Brice Goglin ] * Add a link to www.X.org and a reference to the upstream module commit 97864ab06398d2c1b73a83dd799b57b2842d3064 Author: Julien Cristau <[email protected]> Date: Tue Aug 25 18:31:49 2009 +0200 Link against libICE libXt uses IceConnectionNumber() and IceProcessMessages(), so make sure we link against -lICE. Signed-off-by: Julien Cristau <[email protected]> (cherry picked from commit fedc095da647b6f4fda8ca5edc5644458e2b2fbf) diff --git a/configure.ac b/configure.ac index 043ab5f..33f23cd 100755 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ if test x"$CC_FOR_BUILD" = x; then fi AC_SUBST([CC_FOR_BUILD]) -PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) +PKG_CHECK_MODULES(XT, sm ice x11 xproto kbproto) # Needed for including Xalloca.h AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xalloca.h should include <alloca.h>])) commit 9a06731cda9157ad79c385d547bf67125168626e Author: Julien Cristau <[email protected]> Date: Tue Aug 25 19:10:25 2009 +0200 Stop passing "-include X11/XlibConf.h" in CFLAGS This was a hack introduced in 1:0.99.0+cvs.20050803-1, and unneeded since the upstream fix on Sep 24, 2005. diff --git a/debian/changelog b/debian/changelog index 844239d..657d3f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ libxt (1:1.0.6-1) UNRELEASED; urgency=low * Remove patch 01_use_extern_C_in_headers.diff, applied upstream. * Use --with-xfile-search-path rather than setting XFILESEARCHPATHDEFAULT through CFLAGS directly. + * Stop passing "-include X11/XlibConf.h" in CFLAGS; this was a hack + introduced in 1:0.99.0+cvs.20050803-1, and unneeded since the upstream fix + on Sep 24, 2005. [ Brice Goglin ] * Add a link to www.X.org and a reference to the upstream module diff --git a/debian/rules b/debian/rules index a77279f..0ff1312 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ endif # inheritance mechanism; LP: #343574 LDFLAGS := $(LDFLAGS:-Wl,-Bsymbolic-functions=) -CFLAGS += -include X11/XlibConf.h -D_REENTRANT +CFLAGS += -D_REENTRANT build: build-stamp build-stamp: $(STAMP_DIR)/patch commit 340c0840ae19f91785fe5cdfc25a35b64580985e Author: Julien Cristau <[email protected]> Date: Tue Aug 25 19:04:02 2009 +0200 Use --with-xfile-search-path Rather than setting XFILESEARCHPATHDEFAULT through CFLAGS directly, use the appropriate configure flag. diff --git a/debian/changelog b/debian/changelog index 38fb961..844239d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ libxt (1:1.0.6-1) UNRELEASED; urgency=low * Allow parallel builds. * Run autoreconf on build. * Remove patch 01_use_extern_C_in_headers.diff, applied upstream. + * Use --with-xfile-search-path rather than setting XFILESEARCHPATHDEFAULT + through CFLAGS directly. [ Brice Goglin ] * Add a link to www.X.org and a reference to the upstream module diff --git a/debian/rules b/debian/rules index 0fb89a2..a77279f 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ endif # inheritance mechanism; LP: #343574 LDFLAGS := $(LDFLAGS:-Wl,-Bsymbolic-functions=) -CFLAGS += -DXFILESEARCHPATHDEFAULT=\\\"/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S:/etc/X11/%L/%T/%N%C%S:/etc/X11/%l/%T/%N%C%S:/etc/X11/%T/%N%C%S:/etc/X11/%L/%T/%N%S:/etc/X11/%l/%T/%N%S:/etc/X11/%T/%N%S\\\" -include X11/XlibConf.h -D_REENTRANT +CFLAGS += -include X11/XlibConf.h -D_REENTRANT build: build-stamp build-stamp: $(STAMP_DIR)/patch @@ -48,6 +48,7 @@ build-stamp: $(STAMP_DIR)/patch ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ --with-appdefaultdir=/etc/X11/app-defaults \ + --with-xfile-search-path="/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S:/etc/X11/%L/%T/%N%C%S:/etc/X11/%l/%T/%N%C%S:/etc/X11/%T/%N%C%S:/etc/X11/%L/%T/%N%S:/etc/X11/%l/%T/%N%S:/etc/X11/%T/%N%S" CFLAGS="$(CFLAGS)" \ LDFLAGS="$(LDFLAGS)" cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) commit 4167cdb16fe5ec3b292bd6c94a048a31491ae966 Author: Julien Cristau <[email protected]> Date: Tue Aug 25 18:50:23 2009 +0200 One more autofoo-generated file diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 23e5f25..0000000 --- a/INSTALL +++ /dev/null @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/debian/rules b/debian/rules index eb0ed26..0fb89a2 100755 --- a/debian/rules +++ b/debian/rules @@ -64,7 +64,7 @@ clean: xsfclean rm -rf autom4te.cache */autom4te.cache rm -rf obj-* rm -f aclocal.m4 compile config.guess config.h.in config.sub configure - rm -f depcomp install-sh ltmain.sh missing mkinstalldirs + rm -f depcomp install-sh ltmain.sh missing mkinstalldirs INSTALL find -name Makefile.in -delete dh_clean commit bf432d1671ed563504638d3a49052922687d579f Author: Julien Cristau <[email protected]> Date: Tue Aug 25 18:48:07 2009 +0200 Remove patch 01_use_extern_C_in_headers.diff, applied upstream. diff --git a/debian/changelog b/debian/changelog index 9c09b7a..38fb961 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ libxt (1:1.0.6-1) UNRELEASED; urgency=low * Parse space-separated DEB_BUILD_OPTIONS. * Allow parallel builds. * Run autoreconf on build. + * Remove patch 01_use_extern_C_in_headers.diff, applied upstream. [ Brice Goglin ] * Add a link to www.X.org and a reference to the upstream module diff --git a/debian/patches/01_use_extern_C_in_headers.diff b/debian/patches/01_use_extern_C_in_headers.diff deleted file mode 100644 index 67c7e25..0000000 --- a/debian/patches/01_use_extern_C_in_headers.diff +++ /dev/null @@ -1,523 +0,0 @@ -From f8d3b7585d583ebaa408a66c3a65610acfe4577b Mon Sep 17 00:00:00 2001 -From: Julien Cristau <[email protected]> -Date: Thu, 17 May 2007 00:01:08 +0200 -Subject: [PATCH] Add _XFUNCPROTO{BEGIN,END} to various header files. - -This avoids build failures of C++ apps using libXt. ---- - -diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h -index 4ae08ab..64e8152 100644 ---- a/include/X11/CallbackI.h -+++ b/include/X11/CallbackI.h -@@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable; - #define _XtCBCalling 1 - #define _XtCBFreeAfterCalling 2 - -+_XFUNCPROTOBEGIN -+ - typedef struct internalCallbackRec { - unsigned short count; - char is_padded; /* contains NULL padding for external form */ -@@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList( - XtPointer /* call_data */, - _XtConditionProc /* cond_proc */ - ); -+ -+_XFUNCPROTOEND -diff --git a/include/X11/CompositeP.h b/include/X11/CompositeP.h -index ed055b2..e93275a 100644 ---- a/include/X11/CompositeP.h -+++ b/include/X11/CompositeP.h -@@ -52,6 +52,8 @@ SOFTWARE. - - #include <X11/Composite.h> - -+_XFUNCPROTOBEGIN -+ - /************************************************************************ - * - * Additional instance fields for widgets of (sub)class 'Composite' -@@ -101,6 +103,8 @@ typedef struct _CompositeClassRec { - - externalref CompositeClassRec compositeClassRec; - -+_XFUNCPROTOEND -+ - #define XtCompositeExtensionVersion 2L - #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit) - #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit) -diff --git a/include/X11/ConstrainP.h b/include/X11/ConstrainP.h -index a90d19a..7030a34 100644 ---- a/include/X11/ConstrainP.h -+++ b/include/X11/ConstrainP.h -@@ -52,6 +52,8 @@ SOFTWARE. - - #include <X11/Constraint.h> - -+_XFUNCPROTOBEGIN -+ - typedef struct _ConstraintPart { - XtPointer mumble; /* No new fields, keep C compiler happy */ - } ConstraintPart; -@@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec { - - externalref ConstraintClassRec constraintClassRec; - -+_XFUNCPROTOEND -+ - #define XtConstraintExtensionVersion 1L - - #endif /* _XtConstraintP_h */ -diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h -index 9bb962e..b8bd902 100644 ---- a/include/X11/Constraint.h -+++ b/include/X11/Constraint.h -@@ -50,11 +50,15 @@ SOFTWARE. - #ifndef _XtConstraint_h - #define _XtConstraint_h - -+_XFUNCPROTOBEGIN -+ - typedef struct _ConstraintClassRec *ConstraintWidgetClass; - - #ifndef CONSTRAINT - externalref WidgetClass constraintWidgetClass; - #endif - -+_XFUNCPROTOEND -+ - #endif /* _XtConstraint_h */ - /* DON'T ADD STUFF AFTER THIS #endif */ -diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h -index 02c0e5c..f3f7fb0 100644 ---- a/include/X11/ConvertI.h -+++ b/include/X11/ConvertI.h -@@ -48,6 +48,8 @@ SOFTWARE. - ******************************************************************/ - /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */ - -+_XFUNCPROTOBEGIN -+ - /* Representation types */ - - extern XrmQuark _XtQString; -@@ -94,3 +96,4 @@ extern Boolean _XtConvert( - - void _XtConvertInitialize(void); - -+_XFUNCPROTOEND -diff --git a/include/X11/Core.h b/include/X11/Core.h -index ff6cb75..e1a7c28 100644 ---- a/include/X11/Core.h -+++ b/include/X11/Core.h -@@ -53,6 +53,8 @@ SOFTWARE. - #ifndef _XtCore_h - #define _XtCore_h - -+_XFUNCPROTOBEGIN -+ - typedef struct _WidgetClassRec *CoreWidgetClass; - typedef struct _WidgetRec *CoreWidget; - externalref WidgetClass coreWidgetClass; -@@ -62,5 +64,7 @@ externalref WidgetClass widgetClass; - - #endif - -+_XFUNCPROTOEND -+ - #endif /* _XtCore_h */ - /* DON'T ADD STUFF AFTER THIS #endif */ -diff --git a/include/X11/CoreP.h b/include/X11/CoreP.h -index e07f085..57836e6 100644 ---- a/include/X11/CoreP.h -+++ b/include/X11/CoreP.h -@@ -55,6 +55,8 @@ SOFTWARE. - - #include <X11/Core.h> - -+_XFUNCPROTOBEGIN -+ - externalref int _XtInheritTranslations; - - #define XtInheritTranslations ((String) &_XtInheritTranslations) -@@ -167,5 +169,7 @@ typedef struct _WidgetClassRec { - externalref WidgetClassRec widgetClassRec; - #define coreClassRec widgetClassRec - -+_XFUNCPROTOEND -+ - #endif /* _XtCoreP_h */ - /* DON'T ADD STUFF AFTER THIS #endif */ -diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h -index 87abb1d..e0ca9a3 100644 ---- a/include/X11/CreateI.h -+++ b/include/X11/CreateI.h -@@ -3,6 +3,8 @@ - #ifndef _XtcreateI_h - #define _XtcreateI_h - -+_XFUNCPROTOBEGIN -+ - extern Widget _XtCreateWidget(String name, WidgetClass widget_class, - Widget parent, ArgList args, Cardinal num_args, - XtTypedArgList typed_args, -@@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class, - Cardinal num_typed_args); - extern Widget _XtCreateHookObj(Screen *screen); - -+_XFUNCPROTOEND - - #include <stdarg.h> - -+_XFUNCPROTOBEGIN -+ - /* VarCreate.c */ - extern Widget _XtVaOpenApplication(XtAppContext *app_context_return, - _Xconst char* application_class, -@@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return, - int *argc_in_out, String *argv_in_out, - String *fallback_resources, va_list var_args); - -+_XFUNCPROTOEND -+ - #endif /* _XtcreateI_h */ -diff --git a/include/X11/EventI.h b/include/X11/EventI.h -index 00858e7..d2d1d0f 100644 ---- a/include/X11/EventI.h -+++ b/include/X11/EventI.h -@@ -65,6 +65,8 @@ typedef struct _XtGrabRec *XtGrabList; - - #include "PassivGraI.h" - -+_XFUNCPROTOBEGIN -+ - extern void _XtEventInitialize( - void - ); -@@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr, - /* NextEvent.c */ - extern Boolean XtAppPeekEvent_SkipTimer; - -+_XFUNCPROTOEND -+ - #endif /* _Event_h_ */ -diff --git a/include/X11/HookObjI.h b/include/X11/HookObjI.h -index c9a22a2..c0858c2 100644 ---- a/include/X11/HookObjI.h -+++ b/include/X11/HookObjI.h -@@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group. - #ifndef _XtHookObjI_h - #define _XtHookObjI_h - -+_XFUNCPROTOBEGIN -+ - /* This object is implementation-dependent and private to the library. */ - - typedef struct _HookObjRec *HookObject; -@@ -66,6 +68,8 @@ typedef struct _HookObjClassRec { - - externalref HookObjClassRec hookObjClassRec; - -+_XFUNCPROTOEND -+ - #endif /* ifndef _Xt_HookObjI_h */ - - -diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h -index c2fe47c..2ae9b74 100644 ---- a/include/X11/InitialI.h -+++ b/include/X11/InitialI.h -@@ -84,6 +84,8 @@ SOFTWARE. - #include <X11/Xos.h> - #include <X11/Xpoll.h> - -+_XFUNCPROTOBEGIN -+ - typedef struct _TimerEventRec { - struct timeval te_timer_value; - struct _TimerEventRec *te_next; -@@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist, - String *applName, String *displayName, - String *language); - -+_XFUNCPROTOEND -+ - #endif /* _XtinitialI_h */ -diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h -index d749867..d88166f 100644 ---- a/include/X11/IntrinsicI.h -+++ b/include/X11/IntrinsicI.h -@@ -194,6 +194,8 @@ SOFTWARE. - #define ERRORDB "/usr/lib/X11/XtErrorDB" - #endif - -+_XFUNCPROTOBEGIN -+ - extern String XtCXtToolkitError; - - extern void _XtAllocError( -@@ -257,5 +259,7 @@ extern char* __XtCalloc ( - #define __XtCalloc XtCalloc - #endif - -+_XFUNCPROTOEND -+ - #endif /* _XtintrinsicI_h */ - /* DON'T ADD STUFF AFTER THIS #endif */ -diff --git a/include/X11/Object.h b/include/X11/Object.h -index 96723b1..2c84aaf 100644 ---- a/include/X11/Object.h -+++ b/include/X11/Object.h -@@ -50,11 +50,16 @@ SOFTWARE. - #ifndef _XtObject_h - #define _XtObject_h - -+_XFUNCPROTOBEGIN -+ - typedef struct _ObjectRec *Object; - typedef struct _ObjectClassRec *ObjectClass; - - #ifndef OBJECT - externalref WidgetClass objectClass; - #endif -+ -+_XFUNCPROTOEND -+ - #endif /* _XtObject_h */ - /* DON'T ADD STUFF AFTER THIS #endif */ -diff --git a/include/X11/ObjectP.h b/include/X11/ObjectP.h -index a24564e..0f484d2 100644 ---- a/include/X11/ObjectP.h -+++ b/include/X11/ObjectP.h -@@ -52,6 +52,8 @@ SOFTWARE. - - #include <X11/Object.h> - -+_XFUNCPROTOBEGIN -+ - /********************************************************** - * Object Instance Data Structures - * -@@ -132,6 +134,8 @@ typedef struct _ObjectClassRec { - - externalref ObjectClassRec objectClassRec; - -+_XFUNCPROTOEND -+ - #define XtObjectExtensionVersion 1L - #define XtInheritAllocate ((XtAllocateProc) _XtInherit) - #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit) -diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h -index 02e2964..10591ac 100644 ---- a/include/X11/PassivGraI.h -+++ b/include/X11/PassivGraI.h -@@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group. - #define KEYBOARD TRUE - #define POINTER FALSE - -+_XFUNCPROTOBEGIN -+ - typedef enum { - XtNoServerGrab, - XtPassiveServerGrab, -@@ -183,4 +185,6 @@ extern void _XtClearAncestorCache( - Widget /* widget */ - ); - -+_XFUNCPROTOEND -+ - #endif /* _PDI_h_ */ -diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h -index 07615fa..dced5c3 100644 ---- a/include/X11/RectObj.h -+++ b/include/X11/RectObj.h -@@ -50,11 +50,16 @@ SOFTWARE. - #ifndef _XtRect_h - #define _XtRect_h - -+_XFUNCPROTOBEGIN -+ - typedef struct _RectObjRec *RectObj; - typedef struct _RectObjClassRec *RectObjClass; - - #ifndef RECTOBJ - externalref WidgetClass rectObjClass; - #endif -+ -+_XFUNCPROTOEND -+ - #endif /* _XtRect_h */ - /* DON'T ADD STUFF AFTER THIS #endif */ -diff --git a/include/X11/RectObjP.h b/include/X11/RectObjP.h -index ca3b8ad..d6ffb78 100644 ---- a/include/X11/RectObjP.h -+++ b/include/X11/RectObjP.h -@@ -53,6 +53,8 @@ SOFTWARE. - #include <X11/RectObj.h> - #include <X11/ObjectP.h> - -+_XFUNCPROTOBEGIN -+ - /********************************************************** - * Rectangle Object Instance Data Structures - * -@@ -126,4 +128,6 @@ typedef struct _RectObjClassRec { - - externalref RectObjClassRec rectObjClassRec; - -+_XFUNCPROTOEND -+ - #endif /*_Xt_RectObjP_h_*/ -diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h -index d6ed1df..3db97f8 100644 ---- a/include/X11/ResourceI.h -+++ b/include/X11/ResourceI.h -@@ -61,6 +61,8 @@ SOFTWARE. - #define StringToName(string) XrmStringToName(string) - #define StringToClass(string) XrmStringToClass(string) - -+_XFUNCPROTOBEGIN -+ - extern void _XtDependencies( - XtResourceList * /* class_resp */, - Cardinal * /* class_num_resp */, -@@ -96,5 +98,6 @@ extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources, - Cardinal num_resources); - extern void _XtResourceListInitialize(void); - -+_XFUNCPROTOEND - - #endif /* _XtresourceI_h */ -diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h -index 2b08c3f..7297d33 100644 ---- a/include/X11/ShellP.h -+++ b/include/X11/ShellP.h -@@ -67,6 +67,8 @@ SOFTWARE. - * ***** - */ - -+_XFUNCPROTOBEGIN -+ - /*********************************************************************** - * - * Shell Widget Private Data -@@ -214,8 +216,12 @@ typedef struct { - WMShellPart wm; - } WMShellRec, *WMShellWidget; - -+_XFUNCPROTOEND -+ - #include <X11/VendorP.h> - -+_XFUNCPROTOBEGIN -+ - /*********************************************************************** - * - * TransientShell Widget Private Data -@@ -425,4 +431,6 @@ typedef struct { - SessionShellPart session; - } SessionShellRec, *SessionShellWidget; - -+_XFUNCPROTOEND -+ - #endif /* _XtShellPrivate_h */ -diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h -index 1492d77..28cbc98 100644 ---- a/include/X11/ThreadsI.h -+++ b/include/X11/ThreadsI.h -@@ -81,6 +81,8 @@ typedef void (*ThreadAppRestoreLockProc)( - Boolean* /* pushed_thread */ - ); - -+_XFUNCPROTOBEGIN -+ - extern void (*_XtProcessLock)( - void - ); -@@ -93,6 +95,8 @@ extern void (*_XtInitAppLock)( - XtAppContext /* app */ - ); - -+_XFUNCPROTOEND -+ - #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app) - #define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app) - -diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h -index 1224875..6cc3099 100644 ---- a/include/X11/TranslateI.h -+++ b/include/X11/TranslateI.h -@@ -342,6 +342,8 @@ typedef struct _TMGlobalRec{ - #endif /* TRACE_TM */ - }TMGlobalRec; - -+_XFUNCPROTOBEGIN -+ - extern TMGlobalRec _XtGlobalTM; - - #define TM_MOD_SEGMENT_SIZE 16 -@@ -604,3 +606,4 @@ extern void _XtUnmergeTranslations( - /* TMKey.c */ - extern void _XtAllocTMContext(XtPerDisplay pd); - -+_XFUNCPROTOEND -diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h -index e15404a..76ce9bc 100644 ---- a/include/X11/VarargsI.h -+++ b/include/X11/VarargsI.h -@@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group. - - /* private routines */ - -+_XFUNCPROTOBEGIN -+ - extern void _XtCountVaList( -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
