diff options
author | Graham Bloice <graham.bloice@trihedral.com> | 2014-07-02 14:10:02 +0100 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-07-09 05:31:31 +0000 |
commit | 4b5967f68391c9ea048c6ca76eef893e764d4779 (patch) | |
tree | eb816e0ed6784860067300e6ee6313bd88649e8f /wsutil/nghttp2/nghttp2_net.h | |
parent | 5f0fd977d134cf7169e4c7131433fa75c4cd5e27 (diff) | |
download | wireshark-4b5967f68391c9ea048c6ca76eef893e764d4779.tar.gz |
Moved nghttp2 to epan
Cleaned up nghttp2 build
Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d
Reviewed-on: https://code.wireshark.org/review/2937
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'wsutil/nghttp2/nghttp2_net.h')
-rw-r--r-- | wsutil/nghttp2/nghttp2_net.h | 44 |
1 files changed, 0 insertions, 44 deletions
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 <config.h> -#endif /* HAVE_CONFIG_H */ - -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif /* HAVE_ARPA_INET_H */ - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif /* HAVE_NETINET_IN_H */ - -#ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -#endif /* HAVE_WINSOCK2_H */ - -#endif /* NGHTTP2_NET_H */ |