diff options
Diffstat (limited to 'src/ccapi')
| -rw-r--r-- | src/ccapi/common/cci_common.h | 16 | ||||
| -rw-r--r-- | src/ccapi/lib/ccapi_ccache.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/ccapi/common/cci_common.h b/src/ccapi/common/cci_common.h index a77b16c3e..ee4d42d1d 100644 --- a/src/ccapi/common/cci_common.h +++ b/src/ccapi/common/cci_common.h @@ -28,22 +28,24 @@ #define CCI_COMMON_H #include <sys/types.h> + +#if TARGET_OS_MAC #include <stdint.h> +#include <unistd.h> +#define VECTOR_FUNCTIONS_INITIALIZER ,NULL +#else +#include "win-mac.h" +#define VECTOR_FUNCTIONS_INITIALIZER +#endif + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include <com_err.h> #include <CredentialsCache.h> -#if TARGET_OS_MAC -#define VECTOR_FUNCTIONS_INITIALIZER ,NULL -#else -#define VECTOR_FUNCTIONS_INITIALIZER -#endif - #define k_cci_context_initial_ccache_name "Initial default ccache" #include "cci_cred_union.h" diff --git a/src/ccapi/lib/ccapi_ccache.c b/src/ccapi/lib/ccapi_ccache.c index 5a975810c..d486b5369 100644 --- a/src/ccapi/lib/ccapi_ccache.c +++ b/src/ccapi/lib/ccapi_ccache.c @@ -34,6 +34,8 @@ #if TARGET_OS_MAC #warning Workaround for AppleConnect crash causes leak #include <CoreFoundation/CoreFoundation.h> +#else +#pragma warning (disable: 4068) #endif /* ------------------------------------------------------------------------ */ |