diff options
author | Guy Harris <gharris@sonic.net> | 2021-03-16 13:50:13 -0700 |
---|---|---|
committer | Guy Harris <gharris@sonic.net> | 2021-03-16 13:50:13 -0700 |
commit | 2820156fbd4b0213ca015216d8cd97c31b503c8c (patch) | |
tree | ac6593b99ec9ee226b3ccc323164ce80de158516 /ui/tap-sctp-analysis.h | |
parent | 205e77d404244461f2b311a4285dfeeb55117502 (diff) |
Move still *more* headers outside of extern "C".
If a header declares a function, or anything else requiring the extern
"C" decoration, have it wrap the declaration itself; don't rely on the
header itself being included inside extern "C".
Diffstat (limited to 'ui/tap-sctp-analysis.h')
-rw-r--r-- | ui/tap-sctp-analysis.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/tap-sctp-analysis.h b/ui/tap-sctp-analysis.h index 10f4afd81b..307d6be5d9 100644 --- a/ui/tap-sctp-analysis.h +++ b/ui/tap-sctp-analysis.h @@ -11,20 +11,20 @@ #ifndef __TAP_SCTP_ANALYSIS_H__ #define __TAP_SCTP_ANALYSIS_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include <epan/dissectors/packet-sctp.h> #include <epan/address.h> -#ifndef _WIN32 +#ifdef _WIN32 +#include <winsock2.h> +#else #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> -#else -#include <winsock2.h> #endif +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + #define CHUNK_TYPE_LENGTH 1 #define CHUNK_FLAGS_LENGTH 1 #define CHUNK_LENGTH_LENGTH 2 |