Use __inline with MSVC for all source files.

diff --git a/print-ospf.c b/print-ospf.c
index f8ff4aeac5b0d770ca4f72a99321e623b062f82d..736f5df39505c65208397fbb7b98b90a6e755e82 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -187,10 +187,6 @@ static struct tok ospf_lls_eo_options[] = {
 
 static char tstr[] = " [|ospf2]";
 
-#ifdef WIN32
-#define inline __inline
-#endif /* WIN32 */
-
 static int ospf_print_lshdr(const struct lsa_hdr *);
 static const u_char *ospf_print_lsa(const struct lsa *);
 static int ospf_decode_v2(const struct ospfhdr *, const u_char *);

diff --git a/print-ospf6.c b/print-ospf6.c
index fb62b3968597f64103e65dc994ae873191ba0968..dbd07ec3d436fe76b79e6d9cc8250b5ee351d5c3 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -117,10 +117,6 @@ static struct tok ospf6_lsa_prefix_option_values[] = {
 
 static char tstr[] = " [|ospf3]";
 
-#ifdef WIN32
-#define inline __inline
-#endif /* WIN32 */
-
 /* Forwards */
 static void ospf6_print_ls_type(u_int, const rtrid_t *);
 static int ospf6_print_lshdr(const struct lsa6_hdr *);

diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index d350d1be126b3c7529162fc95eeef83434cd8be2..1e5fc3a9fcf9c1a1fa8f1ce12ee3a0a2128b087f 100644 (file)
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -84,6 +84,13 @@ extern const char *inet_ntop (int, const void *, char *, size_t);
 extern int inet_pton (int, const char *, void *);
 extern int inet_aton (const char *cp, struct in_addr *addr);
 
+/*
+ * With MSVC, for C, __inline is used to make a function an inline.
+ */
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46
 #endif