svn commit: r275996 - in stable/10/lib/libnetbsd: netinet sys

[Garrett Cooper]

Author: ngie
Date: Sun Dec 21 11:11:17 2014
New Revision: 275996
URL: https://svnweb.freebsd.org/changeset/base/275996

Log:
  MFC r273482,r274078:
  
  r273482:
  
    The NetBSD libc tests use several definitions/macros that aren't available in
    FreeBSD
  
    Add the missing compat definitions/macros to lib/libnetbsd so the testcases
    can be compiled with libnetbsd without having to invent ad hoc #define's, or
    having to convert things over to FreeBSD idioms
  
    Reviewed by: brooks
    Phabric: D993
    Sponsored by: EMC / Isilon Storage Division
  
  r274078:
  
    Commit missing header for sys/time.h compat on NetBSD to unbreak the amd64/i386
    build
  
    Pointyhat to: me (forgot to svn add it sooner)

Added:
  stable/10/lib/libnetbsd/netinet/
     - copied from r273482, head/lib/libnetbsd/netinet/
  stable/10/lib/libnetbsd/sys/time.h
     - copied unchanged from r274078, head/lib/libnetbsd/sys/time.h
Modified:
  stable/10/lib/libnetbsd/sys/cdefs.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libnetbsd/sys/cdefs.h
==============================================================================
--- stable/10/lib/libnetbsd/sys/cdefs.h	Sun Dec 21 11:03:59 2014	(r275995)
+++ stable/10/lib/libnetbsd/sys/cdefs.h	Sun Dec 21 11:11:17 2014	(r275996)
@@ -42,6 +42,28 @@
 #endif
 
 /*
+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
+ * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
+ * in between its arguments.  __CONCAT can also concatenate double-quoted
+ * strings produced by the __STRING macro, but this only works with ANSI C.
+ */
+
+#define	___STRING(x)	__STRING(x)
+#define	___CONCAT(x,y)	__CONCAT(x,y)
+
+/*
+ * The following macro is used to remove const cast-away warnings
+ * from gcc -Wcast-qual; it should be used with caution because it
+ * can hide valid errors; in particular most valid uses are in
+ * situations where the API requires it, not to cast away string
+ * constants. We don't use *intptr_t on purpose here and we are
+ * explicit about unsigned long so that we don't have additional
+ * dependencies.
+ */
+#define __UNCONST(a)	((void *)(unsigned long)(const void *)(a))
+
+/*
  * Return the number of elements in a statically-allocated array,
  * __x.
  */

Copied: stable/10/lib/libnetbsd/sys/time.h (from r274078, head/lib/libnetbsd/sys/time.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/libnetbsd/sys/time.h	Sun Dec 21 11:11:17 2014	(r275996, copy of r274078, head/lib/libnetbsd/sys/time.h)
@@ -0,0 +1,65 @@
+/* $FreeBSD$ */
+
+/*
+ * Copyright (c) 1982, 1986, 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. 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.
+ *
+ *	@(#)time.h	8.5 (Berkeley) 5/4/95
+ */
+
+#ifndef _LIBNETBSD_SYS_TIME_H_
+#define	_LIBNETBSD_SYS_TIME_H_
+
+#include_next <sys/time.h>
+
+/* Operations on timespecs. */
+#define	timespecclear(tsp)	(tsp)->tv_sec = (time_t)((tsp)->tv_nsec = 0L)
+#define	timespecisset(tsp)	((tsp)->tv_sec || (tsp)->tv_nsec)
+#define	timespeccmp(tsp, usp, cmp)					\
+	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
+	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
+	    ((tsp)->tv_sec cmp (usp)->tv_sec))
+#define	timespecadd(tsp, usp, vsp)					\
+	do {								\
+		(vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec;		\
+		(vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec;	\
+		if ((vsp)->tv_nsec >= 1000000000L) {			\
+			(vsp)->tv_sec++;				\
+			(vsp)->tv_nsec -= 1000000000L;			\
+		}							\
+	} while (/* CONSTCOND */ 0)
+#define	timespecsub(tsp, usp, vsp)					\
+	do {								\
+		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\
+		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	\
+		if ((vsp)->tv_nsec < 0) {				\
+			(vsp)->tv_sec--;				\
+			(vsp)->tv_nsec += 1000000000L;			\
+		}							\
+	} while (/* CONSTCOND */ 0)
+
+#endif