config.h   config.h 
skipping to change at line 58 skipping to change at line 58
/* winsock2 includes windows.h. /* winsock2 includes windows.h.
Note that we can't include both winsock.h and winsock2.h as Note that we can't include both winsock.h and winsock2.h as
they conflict */ they conflict */
#include <winsock2.h> #include <winsock2.h>
/* Our package */ /* Our package */
#define PACKAGE "cyrus-sasl" #define PACKAGE "cyrus-sasl"
/* Our version */ /* Our version */
#define VERSION "2.1.23" #define VERSION "2.1.25"
/* Visual Studio supports prototypes */ /* Visual Studio supports prototypes */
#define PROTOTYPES 1 #define PROTOTYPES 1
#ifndef HAVE_CADDR_T #ifndef HAVE_CADDR_T
#ifndef caddr_t #ifndef caddr_t
typedef unsigned char *caddr_t; typedef unsigned char *caddr_t;
#define HAVE_CADDR_T 1 #define HAVE_CADDR_T 1
#endif #endif
#endif #endif
skipping to change at line 98 skipping to change at line 98
/* what db package are we using? */ /* what db package are we using? */
/* #undef SASL_GDBM */ /* #undef SASL_GDBM */
/* #undef SASL_NDBM */ /* #undef SASL_NDBM */
#define SASL_BERKELEYDB 1 #define SASL_BERKELEYDB 1
/* which mechs can we link staticly? */ /* which mechs can we link staticly? */
#define STATIC_ANONYMOUS 1 #define STATIC_ANONYMOUS 1
#define STATIC_CRAMMD5 1 #define STATIC_CRAMMD5 1
#define STATIC_DIGESTMD5 1 #define STATIC_DIGESTMD5 1
#define STATIC_SCRAM 1
#define STATIC_GSSAPIV2 1 #define STATIC_GSSAPIV2 1
/* #undef STATIC_KERBEROS4 */ /* #undef STATIC_KERBEROS4 */
#define STATIC_LOGIN 1 #define STATIC_LOGIN 1
/* #undef STATIC_MYSQL */ /* #undef STATIC_MYSQL */
#define STATIC_OTP 1 #define STATIC_OTP 1
#define STATIC_PLAIN 1 #define STATIC_PLAIN 1
#define STATIC_SASLDB 1 #define STATIC_SASLDB 1
#define STATIC_SRP 1 #define STATIC_SRP 1
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
skipping to change at line 199 skipping to change at line 200
#ifndef AI_NUMERICHOST /* support glibc 2.0.x */ #ifndef AI_NUMERICHOST /* support glibc 2.0.x */
#define AI_NUMERICHOST 4 #define AI_NUMERICHOST 4
#define NI_NUMERICHOST 2 #define NI_NUMERICHOST 2
#define NI_NAMEREQD 4 #define NI_NAMEREQD 4
#define NI_NUMERICSERV 8 #define NI_NUMERICSERV 8
#endif #endif
#include <time.h> #include <time.h>
typedef int ssize_t; /* Keep in sync with SleepyCat definitions */
typedef int int32_t;
typedef __int64 int64_t;
#ifdef _WIN64
typedef int64_t ssize_t;
#else
typedef int32_t ssize_t;
#endif
#define HIER_DELIMITER '\\' #define HIER_DELIMITER '\\'
#ifndef sleep #ifndef sleep
#define sleep(seconds) plug_sleep(seconds) #define sleep(seconds) plug_sleep(seconds)
unsigned int plug_sleep(unsigned int seconds); unsigned int plug_sleep(unsigned int seconds);
#endif #endif
#endif /* CONFIG_H */ #endif /* CONFIG_H */
 End of changes. 3 change blocks. 
2 lines changed or deleted 10 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/