feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

zeroconf: fix include paths for minGW

Browse Source 
Task-number: QTCREATORBUG-7189
Change-Id: Ie0dfe044a5b79af1b320683d27698a9d89ab3ede
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Fawzi Mohamed
2012-03-26 15:53:12 +02:00
parent 8abf7b9aa1
commit 72e0f26cbc
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/zeroconf/embed/CommonServices.h
View File

@@ -766,7 +766,7 @@
typedef uint32_t uint_fast32_t; typedef uint32_t uint_fast32_t;
typedef uint64_t uint_fast64_t; typedef uint64_t uint_fast64_t;
#if( !defined( _MSC_VER ) || TARGET_OS_WINDOWS_CE ) #if (( !defined( _MSC_VER ) || TARGET_OS_WINDOWS_CE ) && !defined( _WIN32 ) )
typedef long int intptr_t; typedef long int intptr_t;
typedef unsigned long int uintptr_t; typedef unsigned long int uintptr_t;
#endif #endif

4
src/libs/zeroconf/embed/dnssd_clientlib.c
View File

@@ -29,7 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "dns_sd_types.h" #include "../dns_sd_types.h"
#if MDNS_BUILDINGSHAREDLIBRARY || MDNS_BUILDINGSTUBLIBRARY #if MDNS_BUILDINGSHAREDLIBRARY || MDNS_BUILDINGSTUBLIBRARY
//#pragma export on //#pragma export on
@@ -49,7 +49,7 @@
*********************************************************************************************/ *********************************************************************************************/
namespace ZeroConf { namespace embeddedLib { namespace ZeroConf { namespace embeddedLib {
#include "dns_sd_funct.h" #include "../dns_sd_funct.h"
#define mDNSIsDigit(X) ((X) >= '0' && (X) <= '9') #define mDNSIsDigit(X) ((X) >= '0' && (X) <= '9')

6
src/libs/zeroconf/embed/dnssd_clientstub.c
View File

@@ -36,15 +36,15 @@
#include "dnssd_ipc.h" #include "dnssd_ipc.h"
namespace ZeroConf { namespace embeddedLib { namespace ZeroConf { namespace embeddedLib {
#include "dns_sd_funct.h" #include "../dns_sd_funct.h"
static int gDaemonErr = kDNSServiceErr_NoError; static int gDaemonErr = kDNSServiceErr_NoError;
}} }}
#if defined(_WIN32) #if defined(_WIN32)
#define _SSIZE_T #define _SSIZE_T
#include "embed/CommonServices.h" #include "CommonServices.h"
#include "embed/DebugServices.h" #include "DebugServices.h"
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <windows.h> #include <windows.h>

2
src/libs/zeroconf/embed/dnssd_ipc.h
View File

@@ -29,7 +29,7 @@
#ifndef DNSSD_IPC_H #ifndef DNSSD_IPC_H
#define DNSSD_IPC_H #define DNSSD_IPC_H
#include "dns_sd_types.h" #include "../dns_sd_types.h"
// //
// Common cross platform services // Common cross platform services