From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 19 Mar 2017 22:13:57 +0000 (-0700)
Subject: Merge pull request #568 from gvanem/master
X-Git-Tag: libpcap-1.9-bp~840
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/99ab600b192f5971cb76f925f41015c100b44e4d

Merge pull request #568 from gvanem/master

MSVC's strdup() in _DEBUG mode
---

99ab600b192f5971cb76f925f41015c100b44e4d
diff --cc portability.h
index d4343e62,f050ffa2..179ecd92
--- a/portability.h
+++ b/portability.h
@@@ -87,8 -85,24 +87,10 @@@ extern "C" 
   #endif
  #endif
  
 -/*
 - * For flagging arguments as format strings in MSVC.
 - */
 -#if _MSC_VER >= 1400
 - #include <sal.h>
 - #if _MSC_VER > 1400
 -  #define FORMAT_STRING(p) _Printf_format_string_ p
 - #else
 -  #define FORMAT_STRING(p) __format_string p
 - #endif
 -#else
 - #define FORMAT_STRING(p) p
 -#endif
 -
  #ifdef _MSC_VER
+   #ifndef _DEBUG
    #define strdup	_strdup
+   #endif
    #define sscanf	sscanf_s
    #define setbuf(x, y) \
  	setvbuf((x), (y), _IONBF, 0)