[SCM] Image Reduction and Analysis Facility branch, debian, updated. b45b908af5d26b9e7d498c609cf8aca7e941c3f4

Ole Streicher debian at liska.ath.cx
Wed Jun 5 15:43:38 UTC 2013


The following commit has been merged in the debian branch:
commit 0d2956c4abdfe70f975237645ae9493d26317179
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 5 17:29:59 2013 +0200

    Remove stdarg-(freebsd|solaris).h which may have problematic licenses

diff --git a/unix/hlib/libc/stdarg-freebsd.h b/unix/hlib/libc/stdarg-freebsd.h
deleted file mode 100644
index 6cf6b69..0000000
--- a/unix/hlib/libc/stdarg-freebsd.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2002 David E. O'Brien.  All rights reserved.
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.20 2005/03/02 21:33:26 joerg Exp $
- */
-
-#ifndef _MACHINE_STDARG_H_
-#define	_MACHINE_STDARG_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _VA_LIST_DECLARED
-#define	_VA_LIST_DECLARED
-typedef	__va_list	va_list;
-#endif
-
-#ifdef __GNUCLIKE_BUILTIN_STDARG
-
-#define	va_start(ap, last) \
-	__builtin_stdarg_start((ap), (last))
-
-#define	va_arg(ap, type) \
-	__builtin_va_arg((ap), type)
-
-#if __ISO_C_VISIBLE >= 1999
-#define	va_copy(dest, src) \
-	__builtin_va_copy((dest), (src))
-#endif
-
-#define	va_end(ap) \
-	__builtin_va_end(ap)
-
-#else	/* !__GNUCLIKE_BUILTIN_STDARG */
-
-#define	__va_size(type) \
-	(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
-#ifdef __GNUCLIKE_BUILTIN_NEXT_ARG
-#define va_start(ap, last) \
-	((ap) = (va_list)__builtin_next_arg(last))
-#else	/* !__GNUCLIKE_BUILTIN_NEXT_ARG */
-#define	va_start(ap, last) \
-	((ap) = (va_list)&(last) + __va_size(last))
-#endif	/* __GNUCLIKE_BUILTIN_NEXT_ARG */
-
-#define	va_arg(ap, type) \
-	(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
-
-#if __ISO_C_VISIBLE >= 1999
-#define	va_copy(dest, src) \
-	((dest) = (src))
-#endif
-
-#define	va_end(ap)
-
-#endif /* __GNUCLIKE_BUILTIN_STDARG */
-
-#endif /* !_MACHINE_STDARG_H_ */
diff --git a/unix/hlib/libc/stdarg-solaris.h b/unix/hlib/libc/stdarg-solaris.h
deleted file mode 100644
index c35c5ce..0000000
--- a/unix/hlib/libc/stdarg-solaris.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*	THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF AT&T	*/
-/*	The copyright notice above does not evidence any   	*/
-/*	actual or intended publication of such source code.	*/
-
-/*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- * An application should not include this header directly.  Instead it
- * should be included only through the inclusion of other Sun headers.
- *
- * The contents of this header is limited to identifiers specified in the
- * C Standard.  Any new identifiers specified in future amendments to the
- * C Standard must be placed in this header.  If these new identifiers
- * are required to also be in the C++ Standard "std" namespace, then for
- * anything other than macro definitions, corresponding "using" directives
- * must also be added to <stdarg.h>.
- */
-
-#ifndef _ISO_STDARG_ISO_H
-#define	_ISO_STDARG_ISO_H
-
-#pragma ident	"@(#)stdarg_iso.h	1.4	04/11/19 SMI" /* SVr4.0 1.8 */
-
-/*
- * This header defines the ISO C 1989 and ISO C++ 1998 variable
- * argument definitions.
- *
- * The varargs definitions within this header are defined in terms of
- * implementation definitions.  These implementation definitions reside
- * in <sys/va_impl.h>.  This organization enables protected use of
- * the implementation by other standard headers without introducing
- * names into the users' namespace.
- */
-
-#include <sys/va_impl.h>
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#if __cplusplus >= 199711L
-namespace std {
-typedef __va_list va_list;
-}
-#elif !defined(_VA_LIST)
-#define	_VA_LIST
-typedef __va_list va_list;
-#endif
-
-#define	va_start(list, name)	__va_start(list, name)
-#define	va_arg(list, type)	__va_arg(list, type)
-#define	va_end(list)		__va_end(list)
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _ISO_STDARG_ISO_H */

-- 
Image Reduction and Analysis Facility



More information about the debian-science-commits mailing list