From: Yang Tse <yangsita@gmail.com>
Date: Wed, 27 Jun 2012 15:13:16 +0000 (+0200)
Subject: build: add our standard includes to curl_darwinssl.c and curl_multibyte.c
X-Git-Tag: curl-7_27_0~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57d2732ccb97943f2ac026513f2bc1b2b78548f6;p=thirdparty%2Fcurl.git

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

diff --git a/lib/curl_darwinssl.c b/lib/curl_darwinssl.c
index b98e068687..b9989143e6 100644
--- a/lib/curl_darwinssl.c
+++ b/lib/curl_darwinssl.c
@@ -6,6 +6,7 @@
  *                             \___|\___/|_| \_\_____|
  *
  * 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
  * you should have received as part of this distribution. The terms
@@ -27,6 +28,8 @@
 
 #include "setup.h"
 
+#ifdef USE_DARWINSSL
+
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -34,11 +37,11 @@
 #include <sys/socket.h>
 #endif
 
-#ifdef USE_DARWINSSL
 #include <Security/Security.h>
 #include <Security/SecureTransport.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <CommonCrypto/CommonDigest.h>
+
 #include "urldata.h"
 #include "sendf.h"
 #include "inet_pton.h"
@@ -47,6 +50,13 @@
 #include "sslgen.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: */
 #define ioErr -36
 
diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c
index b48c32348a..c85ec563b1 100644
--- a/lib/curl_multibyte.c
+++ b/lib/curl_multibyte.c
@@ -31,6 +31,13 @@
 
 #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 *str_w = NULL;