Index: head/lib/libcasper/services/cap_dns/cap_dns.h
===================================================================
--- head/lib/libcasper/services/cap_dns/cap_dns.h	(revision 366687)
+++ head/lib/libcasper/services/cap_dns/cap_dns.h	(revision 366688)
@@ -1,80 +1,134 @@
 /*-
  * Copyright (c) 2012 The FreeBSD Foundation
  * All rights reserved.
  *
  * This software was developed by Pawel Jakub Dawidek under sponsorship from
  * the FreeBSD Foundation.
  *
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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.
  *
  * $FreeBSD$
  */
 
 #ifndef	_CAP_DNS_H_
 #define	_CAP_DNS_H_
 
 #ifdef HAVE_CASPER
 #define WITH_CASPER
 #endif
 
 #include <sys/cdefs.h>
 #include <sys/socket.h>	/* socklen_t */
 
+/*
+ * Pull these in if we're just inlining calls to the underlying
+ * libc functions.
+ */
+#ifndef	WITH_CASPER
+#include <sys/types.h>
+#include <netdb.h>
+#endif	/* WITH_CASPER */
+
 struct addrinfo;
 struct hostent;
 
 #ifdef WITH_CASPER
 __BEGIN_DECLS
 
 struct hostent *cap_gethostbyname(cap_channel_t *chan, const char *name);
 struct hostent *cap_gethostbyname2(cap_channel_t *chan, const char *name,
     int type);
 struct hostent *cap_gethostbyaddr(cap_channel_t *chan, const void *addr,
     socklen_t len, int type);
 
 int cap_getaddrinfo(cap_channel_t *chan, const char *hostname,
     const char *servname, const struct addrinfo *hints, struct addrinfo **res);
 int cap_getnameinfo(cap_channel_t *chan, const struct sockaddr *sa,
     socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen,
     int flags);
 
 int cap_dns_type_limit(cap_channel_t *chan, const char * const *types,
     size_t ntypes);
 int cap_dns_family_limit(cap_channel_t *chan, const int *families,
     size_t nfamilies);
 
 __END_DECLS
 #else
-#define	cap_gethostbyname(chan, name)		 gethostbyname(name)
-#define cap_gethostbyname2(chan, name, type)	 gethostbyname2(name, type)
-#define cap_gethostbyaddr(chan, addr, len, type) gethostbyaddr(addr, len, type)
 
-#define	cap_getaddrinfo(chan, hostname, servname, hints, res)			\
-	getaddrinfo(hostname, servname, hints, res)
-#define	cap_getnameinfo(chan, sa, salen, host, hostlen, serv, servlen, flags)	\
-	getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
+static inline struct hostent *
+cap_gethostbyname(cap_channel_t *chan __unused, const char *name)
+{
 
-#define	cap_dns_type_limit(chan, types, ntypes)		(0)
-#define cap_dns_family_limit(chan, families, nfamilies)	(0)
-#endif
+	return (gethostbyname(name));
+}
+
+static inline struct hostent *
+cap_gethostbyname2(cap_channel_t *chan __unused, const char *name, int type)
+{
+
+	return (gethostbyname2(name, type));
+}
+
+static inline struct hostent *
+cap_gethostbyaddr(cap_channel_t *chan __unused, const void *addr,
+    socklen_t len, int type)
+{
+
+	return (gethostbyaddr(addr, len, type));
+}
+
+static inline int cap_getaddrinfo(cap_channel_t *chan __unused,
+    const char *hostname, const char *servname, const struct addrinfo *hints,
+    struct addrinfo **res)
+{
+
+	return (getaddrinfo(hostname, servname, hints, res));
+}
+
+static inline int cap_getnameinfo(cap_channel_t *chan __unused,
+    const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen,
+    char *serv, size_t servlen, int flags)
+{
+
+	return (getnameinfo(sa, salen, host, hostlen, serv, servlen, flags));
+}
+
+static inline int
+cap_dns_type_limit(cap_channel_t *chan __unused,
+    const char * const *types __unused,
+    size_t ntypes __unused)
+{
+
+	return (0);
+}
+
+static inline int
+cap_dns_family_limit(cap_channel_t *chan __unused,
+    const int *families __unused,
+    size_t nfamilies __unused)
+{
+
+	return (0);
+}
+#endif	/* WITH_CASPER */
 
 #endif	/* !_CAP_DNS_H_ */