diff options
| -rw-r--r-- | debian/copyright | 1 | ||||
| -rw-r--r-- | debian/copyright.in | 1 | ||||
| -rw-r--r-- | debian/nx-x11proto-core-dev.install | 1 | ||||
| -rw-r--r-- | nx-X11/include/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/include/Xalloca.h | 139 | ||||
| -rw-r--r-- | nx-libs.spec | 1 |
6 files changed, 0 insertions, 145 deletions
diff --git a/debian/copyright b/debian/copyright index 9537f2530..20ab5c97c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -714,7 +714,6 @@ Copyright: 1999-2001, Brian Paul License: Expat Files: nx-X11/include/XWDFile.h - nx-X11/include/Xalloca.h nx-X11/include/Xauth.h nx-X11/include/Xfuncproto.h nx-X11/include/Xfuncs.h diff --git a/debian/copyright.in b/debian/copyright.in index bfbe86d90..00edd8ecf 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -8,7 +8,6 @@ Files: nx-X11/include/DECkeysym.h nx-X11/include/HPkeysym.h nx-X11/include/X.h nx-X11/include/XWDFile.h - nx-X11/include/Xalloca.h nx-X11/include/Xauth.h nx-X11/include/Xfuncproto.h nx-X11/include/Xfuncs.h diff --git a/debian/nx-x11proto-core-dev.install b/debian/nx-x11proto-core-dev.install index 16228d84e..32b0ac248 100644 --- a/debian/nx-x11proto-core-dev.install +++ b/debian/nx-x11proto-core-dev.install @@ -4,7 +4,6 @@ usr/include/*/nx-X11/Sunkeysym.h usr/include/*/nx-X11/X.h usr/include/*/nx-X11/XF86keysym.h usr/include/*/nx-X11/XWDFile.h -usr/include/*/nx-X11/Xalloca.h usr/include/*/nx-X11/Xarch.h usr/include/*/nx-X11/Xatom.h usr/include/*/nx-X11/Xdefs.h diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index 4ef28f913..5fdac47df 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -24,7 +24,6 @@ HEADERS = \ X.h \ XF86keysym.h \ XWDFile.h \ - Xalloca.h \ Xarch.h \ Xatom.h \ Xdefs.h \ @@ -59,7 +58,6 @@ MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) InstallDriverSDKNonExecFile(X.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(Xalloca.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xarch.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xdefs.h,$(DRIVERSDKINCLUDEDIR)/X11) diff --git a/nx-X11/include/Xalloca.h b/nx-X11/include/Xalloca.h deleted file mode 100644 index ef1bf7b96..000000000 --- a/nx-X11/include/Xalloca.h +++ /dev/null @@ -1,139 +0,0 @@ - -/* - -Copyright 1995, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -*/ - -/* - * The purpose of this header is to define the macros ALLOCATE_LOCAL and - * DEALLOCATE_LOCAL appropriately for the platform being compiled on. - * These macros are used to make fast, function-local memory allocations. - * Their characteristics are as follows: - * - * void *ALLOCATE_LOCAL(int size) - * Returns a pointer to size bytes of memory, or NULL if the allocation - * failed. The memory must be freed with DEALLOCATE_LOCAL before the - * function that made the allocation returns. You should not ask for - * large blocks of memory with this function, since on many platforms - * the memory comes from the stack, which may have limited size. - * - * void DEALLOCATE_LOCAL(void *) - * Frees the memory allocated by ALLOCATE_LOCAL. Omission of this - * step may be harmless on some platforms, but will result in - * memory leaks or worse on others. - * - * Before including this file, you should define two macros, - * ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK, that have the - * same characteristics as ALLOCATE_LOCAL and DEALLOCATE_LOCAL. The - * header uses the fallbacks if it doesn't know a "better" way to define - * ALLOCATE_LOCAL and DEALLOCATE_LOCAL. Typical usage would be: - * - * #define ALLOCATE_LOCAL_FALLBACK(_size) malloc(_size) - * #define DEALLOCATE_LOCAL_FALLBACK(_ptr) free(_ptr) - * #include "Xalloca.h" - */ - -#ifndef XALLOCA_H -#define XALLOCA_H 1 - -#ifndef INCLUDE_ALLOCA_H -# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */ -# define INCLUDE_ALLOCA_H -# endif -#endif - -#ifdef INCLUDE_ALLOCA_H -# include <alloca.h> -#endif - -#ifndef NO_ALLOCA -/* - * os-dependent definition of local allocation and deallocation - * If you want something other than (DE)ALLOCATE_LOCAL_FALLBACK - * for ALLOCATE/DEALLOCATE_LOCAL then you add that in here. - */ -# if defined(__HIGHC__) -# ifndef NCR - extern char *alloca(); -# if HCVERSION < 21003 -# define ALLOCATE_LOCAL(size) alloca((int)(size)) - pragma on(alloca); -# else /* HCVERSION >= 21003 */ -# define ALLOCATE_LOCAL(size) _Alloca((int)(size)) -# endif /* HCVERSION < 21003 */ -# else /* NCR */ -# define ALLOCATE_LOCAL(size) alloca(size) -# endif -# endif /* defined(__HIGHC__) */ - - -# ifdef __GNUC__ -# ifndef alloca -# define alloca __builtin_alloca -# endif /* !alloca */ -# define ALLOCATE_LOCAL(size) alloca((int)(size)) -# else /* ! __GNUC__ */ - -/* - * warning: old mips alloca (pre 2.10) is unusable, new one is built in - * Test is easy, the new one is named __builtin_alloca and comes - * from alloca.h which #defines alloca. - */ -# ifndef NCR -# if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca) -/* - * Some System V boxes extract alloca.o from /lib/libPW.a; if you - * decide that you don't want to use alloca, you might want to fix it here. - */ -/* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ -# define __Xnullarg /* as nothing */ -# ifndef X_NOT_STDC_ENV - extern void *alloca(__Xnullarg); -# else - extern char *alloca(__Xnullarg); -# endif -# define ALLOCATE_LOCAL(size) alloca((int)(size)) -# endif /* who does alloca */ -# endif /* NCR */ -# endif /* __GNUC__ */ - -#endif /* NO_ALLOCA */ - -#if !defined(ALLOCATE_LOCAL) -# if defined(ALLOCATE_LOCAL_FALLBACK) && defined(DEALLOCATE_LOCAL_FALLBACK) -# define ALLOCATE_LOCAL(_size) ALLOCATE_LOCAL_FALLBACK(_size) -# define DEALLOCATE_LOCAL(_ptr) DEALLOCATE_LOCAL_FALLBACK(_ptr) -# else /* no fallbacks supplied; error */ -# define ALLOCATE_LOCAL(_size) ALLOCATE_LOCAL_FALLBACK undefined! -# define DEALLOCATE_LOCAL(_ptr) DEALLOCATE_LOCAL_FALLBACK undefined! -# endif /* defined(ALLOCATE_LOCAL_FALLBACK && DEALLOCATE_LOCAL_FALLBACK) */ -#else -# if !defined(DEALLOCATE_LOCAL) -# define DEALLOCATE_LOCAL(_ptr) do {} while(0) -# endif -#endif /* defined(ALLOCATE_LOCAL) */ - -#endif /* XALLOCA_H */ diff --git a/nx-libs.spec b/nx-libs.spec index 344a59a9f..fb1847a9e 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -554,7 +554,6 @@ rm -f %{buildroot}%{_datadir}/man/man1/nxdialog.1* %{_includedir}/nx-X11/X.h %{_includedir}/nx-X11/XF86keysym.h %{_includedir}/nx-X11/XWDFile.h -%{_includedir}/nx-X11/Xalloca.h %{_includedir}/nx-X11/Xarch.h %{_includedir}/nx-X11/Xatom.h %{_includedir}/nx-X11/Xdefs.h |