krb5 commit [krb5-1.10]: KFW win-mac.h fixes

Tom Yu tlyu at MIT.EDU
Mon Jul 23 16:26:23 EDT 2012


https://github.com/krb5/krb5/commit/77dc7747f54545a37f9d3c56801da48c528bc37f
commit 77dc7747f54545a37f9d3c56801da48c528bc37f
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date:   Wed Jun 6 18:22:22 2012 -0400

    KFW win-mac.h fixes
    
    kfw: add int16_t, uint16_t typedefs to win-mac.h
    uint16_t is used in chpw.c
    
    include stdlib.h, crtdbg.h in win-mac.h
    
    Allows leak-tracking using built-in msvc tools on windows.
    crtdbg.h needs to come _after_ stdlib.h, but _before_ checking for
    strdup.  Define DEBUG and CRTDBG_MAP_ALLOC for full tracking.
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
    
    (cherry picked from commit 0a27c56e300990909317630e626ccdd8ae8e7f41)
    
    ticket: 7204
    version_fixed: 1.10.3
    status: resolved

 src/include/win-mac.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index 82d3ff7..e84e172 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -24,6 +24,10 @@
 #include <windows.h>
 
 #else /* ! RES_ONLY */
+#include <stdlib.h>
+#ifdef DEBUG
+#include <crtdbg.h>
+#endif
 
 /* To ensure backward compatibility of the ABI use 32-bit time_t on
  * 32-bit Windows.
@@ -76,6 +80,8 @@ typedef unsigned long    u_long;      /* Not part of sys/types.h on the pc */
 typedef unsigned int     u_int;
 typedef unsigned short   u_short;
 typedef unsigned char    u_char;
+typedef unsigned short   uint16_t;
+typedef short            int16_t;
 typedef unsigned int     uint32_t;
 typedef int              int32_t;
 #if _INTEGRAL_MAX_BITS >= 64


More information about the cvs-krb5 mailing list