[Git][NTPsec/ntpsec][master] Nuke libisc/include/isc/platform.h
Hal Murray
gitlab at mg.gitlab.com
Sat Dec 19 02:47:50 UTC 2015
Hal Murray pushed to branch master at NTPsec / ntpsec
Commits:
f9626b29 by Hal Murray at 2015-12-18T18:47:03Z
Nuke libisc/include/isc/platform.h
- - - - -
13 changed files:
- include/isc/mem.h
- libisc/include/isc/assertions.h
- libisc/include/isc/error.h
- libisc/include/isc/log.h
- libisc/include/isc/md5.h
- libisc/include/isc/once.h
- − libisc/include/isc/platform.h
- − libisc/include/isc/platform.h.in
- libisc/include/isc/sha1.h
- libisc/md5.c
- libisc/sha1.c
- libisc/unix/include/isc/net.h
- libisc/win32/include/isc/net.h
Changes:
=====================================
include/isc/mem.h
=====================================
--- a/include/isc/mem.h
+++ b/include/isc/mem.h
@@ -18,7 +18,6 @@
#include <stdio.h>
#include <isc/lang.h>
-#include <isc/platform.h>
#include <isc/types.h>
#include <ntp_stdlib.h>
=====================================
libisc/include/isc/assertions.h
=====================================
--- a/libisc/include/isc/assertions.h
+++ b/libisc/include/isc/assertions.h
@@ -12,7 +12,6 @@
#define GUARD_ISC_ASSERTIONS_H 1
#include <isc/lang.h>
-#include <isc/platform.h>
ISC_LANG_BEGINDECLS
=====================================
libisc/include/isc/error.h
=====================================
--- a/libisc/include/isc/error.h
+++ b/libisc/include/isc/error.h
@@ -14,7 +14,6 @@
#include <isc/formatcheck.h>
#include <isc/lang.h>
-#include <isc/platform.h>
ISC_LANG_BEGINDECLS
=====================================
libisc/include/isc/log.h
=====================================
--- a/libisc/include/isc/log.h
+++ b/libisc/include/isc/log.h
@@ -17,7 +17,6 @@
#include <isc/formatcheck.h>
#include <isc/lang.h>
-#include <isc/platform.h>
#include <isc/types.h>
/*@{*/
@@ -137,6 +136,8 @@ typedef union isc_logdestination {
* definitions with indexes into its isc_logcategory structure corresponding to
* the order of the names.
*/
+/* All that's left of isc/platform.h */
+#define LIBISC_EXTERNAL_DATA
LIBISC_EXTERNAL_DATA extern isc_logcategory_t isc_categories[];
LIBISC_EXTERNAL_DATA extern isc_log_t *isc_lctx;
LIBISC_EXTERNAL_DATA extern isc_logmodule_t isc_modules[];
=====================================
libisc/include/isc/md5.h
=====================================
--- a/libisc/include/isc/md5.h
+++ b/libisc/include/isc/md5.h
@@ -30,7 +30,6 @@
#define GUARD_ISC_MD5_H 1
#include <isc/lang.h>
-#include <isc/platform.h>
#include <isc/types.h>
#define ISC_MD5_DIGESTLENGTH 16U
=====================================
libisc/include/isc/once.h
=====================================
--- a/libisc/include/isc/once.h
+++ b/libisc/include/isc/once.h
@@ -12,7 +12,6 @@
#include <pthread.h>
-#include <isc/platform.h>
#include <isc/result.h>
typedef pthread_once_t isc_once_t;
=====================================
libisc/include/isc/platform.h deleted
=====================================
--- a/libisc/include/isc/platform.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 1999-2001 Internet Software Consortium.
- * Copyright 2015 by the NTPsec project contributors
- * SPDX-License-Identifier: ISC
- */
-
-#ifndef GUARD_ISC_PLATFORM_H
-#define GUARD_ISC_PLATFORM_H 1
-
-
-#ifndef ISC_PLATFORM_USEDECLSPEC
-#define LIBISC_EXTERNAL_DATA
-#define LIBDNS_EXTERNAL_DATA
-#define LIBISCCC_EXTERNAL_DATA
-#define LIBISCCFG_EXTERNAL_DATA
-#define LIBBIND9_EXTERNAL_DATA
-#endif /* ISC_PLATFORM_USEDECLSPEC */
-
-/*
- * Tell emacs to use C mode for this file.
- *
- * Local Variables:
- * mode: c
- * End:
- */
-
-#endif /* GUARD_ISC_PLATFORM_H */
=====================================
libisc/include/isc/platform.h.in deleted
=====================================
--- a/libisc/include/isc/platform.h.in
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2003 Internet Software Consortium.
- * Copyright 2015 by the NTPsec project contributors
- * SPDX-License-Identifier: ISC
- */
-
-#ifndef ISC_PLATFORM_H
-#define ISC_PLATFORM_H 1
-
-/*! \file */
-
-/*****
- ***** Platform-dependent defines.
- *****/
-
-/***
- *** Network.
- ***/
-
-/*! \brief
- * Define if this system needs the <netinet/in6.h> header file included
- * for full IPv6 support (pretty much only UnixWare).
- */
- at ISC_PLATFORM_NEEDNETINETIN6H@
-
-/*! \brief
- * Define if this system needs the <netinet6/in6.h> header file included
- * to support in6_pkinfo (pretty much only BSD/OS).
- */
- at ISC_PLATFORM_NEEDNETINET6IN6H@
-
-/*! \brief
- * If sockaddrs on this system have an sa_len field, ISC_PLATFORM_HAVESALEN
- * will be defined.
- */
- at ISC_PLATFORM_HAVESALEN@
-
-/*! \brief
- * If this system has the IPv6 structure definitions, ISC_PLATFORM_HAVEIPV6
- * will be defined.
- */
- at ISC_PLATFORM_HAVEIPV6@
-
-/*! \brief
- * If this system is missing in6addr_any, ISC_PLATFORM_NEEDIN6ADDRANY will
- * be defined.
- */
- at ISC_PLATFORM_NEEDIN6ADDRANY@
-
-/*! \brief
- * If this system is missing in6addr_loopback, ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
- * will be defined.
- */
- at ISC_PLATFORM_NEEDIN6ADDRLOOPBACK@
-
-/*! \brief
- * If this system has in6_pktinfo, ISC_PLATFORM_HAVEIN6PKTINFO will be
- * defined.
- */
- at ISC_PLATFORM_HAVEIN6PKTINFO@
-
-/*! \brief
- * If this system has in_addr6, rather than in6_addr, ISC_PLATFORM_HAVEINADDR6
- * will be defined.
- */
- at ISC_PLATFORM_HAVEINADDR6@
-
-/*! \brief
- * If this system has sin6_scope_id, ISC_PLATFORM_HAVESCOPEID will be defined.
- */
- at ISC_PLATFORM_HAVESCOPEID@
-
-/*! \brief
- * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined.
- */
- at ISC_PLATFORM_NEEDPORTT@
-
-/*! \brief
- * Define if the system has struct lifconf which is a extended struct ifconf
- * for IPv6.
- */
- at ISC_PLATFORM_HAVELIFCONF@
-
-/*! \brief
- * Define if the system has struct if_laddrconf which is a extended struct
- * ifconf for IPv6.
- */
- at ISC_PLATFORM_HAVEIF_LADDRCONF@
-
-/*! \brief
- * Define if the system has struct if_laddrreq.
- */
- at ISC_PLATFORM_HAVEIF_LADDRREQ@
-
-/*! \brief
- * Define either ISC_PLATFORM_BSD44MSGHDR or ISC_PLATFORM_BSD43MSGHDR.
- */
- at ISC_PLATFORM_MSGHDRFLAVOR@
-
-/*! \brief
- * Define if the system supports if_nametoindex.
- */
- at ISC_PLATFORM_HAVEIFNAMETOINDEX@
-
-/*! \brief
- * Define on some UnixWare systems to fix erroneous definitions of various
- * IN6_IS_ADDR_* macros.
- */
- at ISC_PLATFORM_FIXIN6ISADDR@
-
-/*! \brief
- * Define if the system supports kqueue multiplexing
- */
- at ISC_PLATFORM_HAVEKQUEUE@
-
-/*! \brief
- * Define if the system supports epoll multiplexing
- */
- at ISC_PLATFORM_HAVEEPOLL@
-
-/*! \brief
- * Define if the system supports /dev/poll multiplexing
- */
- at ISC_PLATFORM_HAVEDEVPOLL@
-
-/*! \brief
- * Define if we want to log backtrace
- */
- at ISC_PLATFORM_USEBACKTRACE@
-
-/*
- *** Printing.
- ***/
-
-/*! \brief
- * If this system needs vsnprintf() and snprintf(), ISC_PLATFORM_NEEDVSNPRINTF
- * will be defined.
- */
- at ISC_PLATFORM_NEEDVSNPRINTF@
-
-/*! \brief
- * If this system need a modern sprintf() that returns (int) not (char*).
- */
- at ISC_PLATFORM_NEEDSPRINTF@
-
-/*! \brief
- * The printf format string modifier to use with isc_uint64_t values.
- */
- at ISC_PLATFORM_QUADFORMAT@
-
-/***
- *** String functions.
- ***/
-/*
- * If the system needs strsep(), ISC_PLATFORM_NEEDSTRSEP will be defined.
- */
- at ISC_PLATFORM_NEEDSTRSEP@
-
-/*
- * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined.
- */
- at ISC_PLATFORM_NEEDSTRLCPY@
-
-/*
- * If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined.
- */
- at ISC_PLATFORM_NEEDSTRLCAT@
-
-/*
- * Define if this system needs strtoul.
- */
- at ISC_PLATFORM_NEEDSTRTOUL@
-
-/*
- * Define if this system needs memmove.
- */
- at ISC_PLATFORM_NEEDMEMMOVE@
-
-/***
- *** Miscellaneous.
- ***/
-
-/*
- * Defined if we are using threads.
- */
- at ISC_PLATFORM_USETHREADS@
-
-/*
- * Defined if unistd.h does not cause fd_set to be delared.
- */
- at ISC_PLATFORM_NEEDSYSSELECTH@
-
-/*
- * Defined to <gssapi.h> or <gssapi/gssapi.h> for how to include
- * the GSSAPI header.
- */
- at ISC_PLATFORM_GSSAPIHEADER@
-
-/*
- * Defined to <gssapi_krb5.h> or <gssapi/gssapi_krb5.h> for how to
- * include the GSSAPI KRB5 header.
- */
- at ISC_PLATFORM_GSSAPI_KRB5_HEADER@
-
-/*
- * Defined to <krb5.h> or <krb5/krb5.h> for how to include
- * the KRB5 header.
- */
- at ISC_PLATFORM_KRB5HEADER@
-
-/*
- * Type used for resource limits.
- */
- at ISC_PLATFORM_RLIMITTYPE@
-
-/*
- * Define if your compiler supports "long long int".
- */
- at ISC_PLATFORM_HAVELONGLONG@
-
-/*
- * Define if PTHREAD_ONCE_INIT should be surrounded by braces to
- * prevent compiler warnings (such as with gcc on Solaris 2.8).
- */
- at ISC_PLATFORM_BRACEPTHREADONCEINIT@
-
-/*
- * Used to control how extern data is linked; needed for Win32 platforms.
- */
- at ISC_PLATFORM_USEDECLSPEC@
-
-/*
- * Define if the platform has <sys/un.h>.
- */
- at ISC_PLATFORM_HAVESYSUNH@
-
-/*
- * If the "xadd" operation is available on this architecture,
- * ISC_PLATFORM_HAVEXADD will be defined.
- */
- at ISC_PLATFORM_HAVEXADD@
-
-/*
- * If the "xaddq" operation (64bit xadd) is available on this architecture,
- * ISC_PLATFORM_HAVEXADDQ will be defined.
- */
- at ISC_PLATFORM_HAVEXADDQ@
-
-/*
- * If the "atomic swap" operation is available on this architecture,
- * ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
- */
- at ISC_PLATFORM_HAVEATOMICSTORE@
-
-/*
- * If the "compare-and-exchange" operation is available on this architecture,
- * ISC_PLATFORM_HAVECMPXCHG will be defined.
- */
- at ISC_PLATFORM_HAVECMPXCHG@
-
-/*
- * Define if gcc ASM extension is available
- */
- at ISC_PLATFORM_USEGCCASM@
-
-/*
- * Define if Tru64 style ASM syntax must be used.
- */
- at ISC_PLATFORM_USEOSFASM@
-
-/*
- * Define if the standard __asm function must be used.
- */
- at ISC_PLATFORM_USESTDASM@
-
-/*
- * Define if the platform has <strings.h>.
- */
- at ISC_PLATFORM_HAVESTRINGSH@
-
-/*
- * Define if the hash functions must be provided by OpenSSL.
- */
- at ISC_PLATFORM_OPENSSLHASH@
-
-/*
- * Defines for the noreturn attribute.
- */
- at ISC_PLATFORM_NORETURN_PRE@
- at ISC_PLATFORM_NORETURN_POST@
-
-/***
- *** Windows dll support.
- ***/
-
-/*
- * Define if MacOS style of PPC assembly must be used.
- * e.g. "r6", not "6", for register six.
- */
- at ISC_PLATFORM_USEMACASM@
-
-#ifndef ISC_PLATFORM_USEDECLSPEC
-#define LIBISC_EXTERNAL_DATA
-#define LIBDNS_EXTERNAL_DATA
-#define LIBISCCC_EXTERNAL_DATA
-#define LIBISCCFG_EXTERNAL_DATA
-#define LIBBIND9_EXTERNAL_DATA
-#else /*! \brief ISC_PLATFORM_USEDECLSPEC */
-#ifdef LIBISC_EXPORTS
-#define LIBISC_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBISC_EXTERNAL_DATA __declspec(dllimport)
-#endif
-#ifdef LIBDNS_EXPORTS
-#define LIBDNS_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBDNS_EXTERNAL_DATA __declspec(dllimport)
-#endif
-#ifdef LIBISCCC_EXPORTS
-#define LIBISCCC_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBISCCC_EXTERNAL_DATA __declspec(dllimport)
-#endif
-#ifdef LIBISCCFG_EXPORTS
-#define LIBISCCFG_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBISCCFG_EXTERNAL_DATA __declspec(dllimport)
-#endif
-#ifdef LIBBIND9_EXPORTS
-#define LIBBIND9_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBBIND9_EXTERNAL_DATA __declspec(dllimport)
-#endif
-#endif /*! \brief ISC_PLATFORM_USEDECLSPEC */
-
-/*
- * Tell emacs to use C mode for this file.
- *
- * Local Variables:
- * mode: c
- * End:
- */
-
-#endif /* ISC_PLATFORM_H */
=====================================
libisc/include/isc/sha1.h
=====================================
--- a/libisc/include/isc/sha1.h
+++ b/libisc/include/isc/sha1.h
@@ -15,7 +15,6 @@
*/
#include <isc/lang.h>
-#include <isc/platform.h>
#include <isc/types.h>
#define ISC_SHA1_DIGESTLENGTH 20U
=====================================
libisc/md5.c
=====================================
--- a/libisc/md5.c
+++ b/libisc/md5.c
@@ -26,7 +26,6 @@
#include <isc/assertions.h>
#include <isc/md5.h>
-#include <isc/platform.h>
#include <isc/types.h>
#include <isc/util.h>
=====================================
libisc/sha1.c
=====================================
--- a/libisc/sha1.c
+++ b/libisc/sha1.c
@@ -25,7 +25,6 @@
#include <string.h>
#include <isc/assertions.h>
-#include <isc/platform.h>
#include <isc/sha1.h>
#include <isc/types.h>
#include <isc/util.h>
=====================================
libisc/unix/include/isc/net.h
=====================================
--- a/libisc/unix/include/isc/net.h
+++ b/libisc/unix/include/isc/net.h
@@ -51,7 +51,6 @@
/***
*** Imports.
***/
-#include <isc/platform.h>
#include <sys/types.h>
#include <sys/socket.h> /* Contractual promise. */
=====================================
libisc/win32/include/isc/net.h
=====================================
--- a/libisc/win32/include/isc/net.h
+++ b/libisc/win32/include/isc/net.h
@@ -67,7 +67,6 @@
/***
*** Imports.
***/
-#include <isc/platform.h>
/*
* Because of some sort of problem in the MS header files, this cannot
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/f9626b29986457d82d76d3409093f97137d06e5c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151219/2a04b58a/attachment.html>
More information about the vc
mailing list