1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00

build: add our standard includes to curl_darwinssl.c and curl_multibyte.c

This commit is contained in:
Yang Tse 2012-06-27 17:13:16 +02:00
parent e6b2eb78a2
commit 57d2732ccb
2 changed files with 18 additions and 1 deletions

View File

@ -6,6 +6,7 @@
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>. * Copyright (C) 2012, Nick Zitzmann, <nickzman@gmail.com>.
* Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -27,6 +28,8 @@
#include "setup.h" #include "setup.h"
#ifdef USE_DARWINSSL
#ifdef HAVE_LIMITS_H #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif
@ -34,11 +37,11 @@
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef USE_DARWINSSL
#include <Security/Security.h> #include <Security/Security.h>
#include <Security/SecureTransport.h> #include <Security/SecureTransport.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <CommonCrypto/CommonDigest.h> #include <CommonCrypto/CommonDigest.h>
#include "urldata.h" #include "urldata.h"
#include "sendf.h" #include "sendf.h"
#include "inet_pton.h" #include "inet_pton.h"
@ -47,6 +50,13 @@
#include "sslgen.h" #include "sslgen.h"
#include "curl_darwinssl.h" #include "curl_darwinssl.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
#include "memdebug.h"
/* From MacTypes.h (which we can't include because it isn't present in iOS: */ /* From MacTypes.h (which we can't include because it isn't present in iOS: */
#define ioErr -36 #define ioErr -36

View File

@ -31,6 +31,13 @@
#include "curl_multibyte.h" #include "curl_multibyte.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
#include "curl_memory.h"
/* The last #include file should be: */
#include "memdebug.h"
wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8) wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8)
{ {
wchar_t *str_w = NULL; wchar_t *str_w = NULL;