From 4b5967f68391c9ea048c6ca76eef893e764d4779 Mon Sep 17 00:00:00 2001 From: Graham Bloice Date: Wed, 2 Jul 2014 14:10:02 +0100 Subject: Moved nghttp2 to epan Cleaned up nghttp2 build Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d Reviewed-on: https://code.wireshark.org/review/2937 Reviewed-by: Pascal Quantin Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Evan Huus --- wsutil/nghttp2/nghttp2_net.h | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 wsutil/nghttp2/nghttp2_net.h (limited to 'wsutil/nghttp2/nghttp2_net.h') diff --git a/wsutil/nghttp2/nghttp2_net.h b/wsutil/nghttp2/nghttp2_net.h deleted file mode 100644 index 621231efd7..0000000000 --- a/wsutil/nghttp2/nghttp2_net.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * nghttp2 - HTTP/2 C Library - * - * Copyright (c) 2012 Tatsuhiro Tsujikawa - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * 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 AUTHORS OR COPYRIGHT HOLDERS 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. - */ -#ifndef NGHTTP2_NET_H -#define NGHTTP2_NET_H - -#ifdef HAVE_CONFIG_H -# include -#endif /* HAVE_CONFIG_H */ - -#ifdef HAVE_ARPA_INET_H -# include -#endif /* HAVE_ARPA_INET_H */ - -#ifdef HAVE_NETINET_IN_H -# include -#endif /* HAVE_NETINET_IN_H */ - -#ifdef HAVE_WINSOCK2_H -# include -#endif /* HAVE_WINSOCK2_H */ - -#endif /* NGHTTP2_NET_H */ -- cgit v1.2.1