xfreerdp: fix compilation on Mac OS X
This commit is contained in:
parent
3a91a37d76
commit
10f6b797cd
2
client/Mac/.gitignore
vendored
Normal file
2
client/Mac/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
*.app
|
||||||
|
|
@ -5,7 +5,7 @@
|
|||||||
<key>CFBundleDevelopmentRegion</key>
|
<key>CFBundleDevelopmentRegion</key>
|
||||||
<string>en</string>
|
<string>en</string>
|
||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>${EXECUTABLE_NAME}</string>
|
<string></string>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleIconFile</key>
|
||||||
<string></string>
|
<string></string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIdentifier</key>
|
||||||
@ -13,7 +13,7 @@
|
|||||||
<key>CFBundleInfoDictionaryVersion</key>
|
<key>CFBundleInfoDictionaryVersion</key>
|
||||||
<string>6.0</string>
|
<string>6.0</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleName</key>
|
||||||
<string>${PRODUCT_NAME}</string>
|
<string></string>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
@ -23,7 +23,7 @@
|
|||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1</string>
|
<string>1</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
|
<string></string>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
<string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
|
<string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
|
||||||
<key>NSMainNibFile</key>
|
<key>NSMainNibFile</key>
|
||||||
|
@ -151,10 +151,6 @@ void http_request_set_auth_param(HttpRequest* http_request, char* auth_param)
|
|||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
|
||||||
#ifndef errno_t
|
|
||||||
typedef int errno_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
errno_t _itoa_s(int value, char* buffer, size_t sizeInCharacters, int radix)
|
errno_t _itoa_s(int value, char* buffer, size_t sizeInCharacters, int radix)
|
||||||
{
|
{
|
||||||
int length;
|
int length;
|
||||||
|
@ -23,6 +23,10 @@
|
|||||||
|
|
||||||
#include "keyboard_keymap.h"
|
#include "keyboard_keymap.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#include <freerdp/utils/file.h>
|
#include <freerdp/utils/file.h>
|
||||||
#include <freerdp/utils/memory.h>
|
#include <freerdp/utils/memory.h>
|
||||||
#include <freerdp/locale/vkcodes.h>
|
#include <freerdp/locale/vkcodes.h>
|
||||||
|
@ -262,7 +262,6 @@ typedef struct _PROCESS_INFORMATION
|
|||||||
typedef DWORD (*PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
|
typedef DWORD (*PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
|
||||||
typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
|
typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
|
||||||
|
|
||||||
typedef void* HMODULE;
|
|
||||||
typedef void* FARPROC;
|
typedef void* FARPROC;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -28,7 +28,12 @@
|
|||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
#include <malloc/malloc.h>
|
||||||
|
#else
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
void* _aligned_malloc(size_t size, size_t alignment)
|
void* _aligned_malloc(size_t size, size_t alignment)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user