Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
belle-sip
Commits
c82f25ab
Commit
c82f25ab
authored
Feb 21, 2013
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation on Windows desktop.
parent
fbfe1d5f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
16 deletions
+16
-16
build/windows/belle-sip/belle-sip.vcxproj
build/windows/belle-sip/belle-sip.vcxproj
+10
-10
src/belle_sip_utils.c
src/belle_sip_utils.c
+1
-1
src/dns.c
src/dns.c
+2
-2
src/port.c
src/port.c
+1
-1
src/port.h
src/port.h
+1
-1
tester/belle_sip_tester.c
tester/belle_sip_tester.c
+1
-1
No files found.
build/windows/belle-sip/belle-sip.vcxproj
View file @
c82f25ab
...
...
@@ -28,7 +28,7 @@
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label=
"Configuration"
>
<ConfigurationType>
DynamicLibrary
</ConfigurationType>
<UseDebugLibraries>
true
</UseDebugLibraries>
<PlatformToolset>
v110
_wp80
</PlatformToolset>
<PlatformToolset>
v110
</PlatformToolset>
<IgnoreImportLibrary>
false
</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)'=='Debug|ARM'"
Label=
"Configuration"
>
...
...
@@ -41,7 +41,7 @@
<ConfigurationType>
DynamicLibrary
</ConfigurationType>
<UseDebugLibraries>
false
</UseDebugLibraries>
<WholeProgramOptimization>
true
</WholeProgramOptimization>
<PlatformToolset>
v110
_wp80
</PlatformToolset>
<PlatformToolset>
v110
</PlatformToolset>
<IgnoreImportLibrary>
false
</IgnoreImportLibrary>
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)'=='Release|ARM'"
Label=
"Configuration"
>
...
...
@@ -57,7 +57,7 @@
</ImportGroup>
<PropertyGroup
Label=
"UserMacros"
/>
<PropertyGroup>
<OutDir>
$(SolutionDir)$(Platform)\$(Configuration)\
$(TargetName)\
</OutDir>
<OutDir>
$(SolutionDir)$(Platform)\$(Configuration)\
</OutDir>
<IntDir>
$(SolutionDir)$(Platform)\$(Configuration)\$(TargetName)\
</IntDir>
</PropertyGroup>
<PropertyGroup>
...
...
@@ -79,7 +79,7 @@
<GenerateWindowsMetadata>
false
</GenerateWindowsMetadata>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
<AdditionalDependencies>
ws2_32.lib;libantlr3c_dll.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration)
\libantlr3c\
;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<ImportLibrary>
$(TargetDir)$(TargetName)_dll.lib
</ImportLibrary>
</Link>
<CustomBuild>
...
...
@@ -106,7 +106,7 @@
<GenerateWindowsMetadata>
false
</GenerateWindowsMetadata>
<GenerateDebugInformation>
false
</GenerateDebugInformation>
<AdditionalDependencies>
ws2_32.lib;libantlr3c_dll.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration)
\libantlr3c\
;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<ImportLibrary>
$(TargetDir)$(TargetName)_dll.lib
</ImportLibrary>
</Link>
<CustomBuild>
...
...
@@ -129,7 +129,7 @@
<GenerateWindowsMetadata>
false
</GenerateWindowsMetadata>
<GenerateDebugInformation>
true
</GenerateDebugInformation>
<AdditionalDependencies>
ws2_32.lib;libantlr3c_dll.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration)
\libantlr3c\
;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<ImportLibrary>
$(TargetDir)$(TargetName)_dll.lib
</ImportLibrary>
</Link>
<CustomBuild>
...
...
@@ -156,7 +156,7 @@
<GenerateWindowsMetadata>
false
</GenerateWindowsMetadata>
<GenerateDebugInformation>
false
</GenerateDebugInformation>
<AdditionalDependencies>
ws2_32.lib;libantlr3c_dll.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration)
\libantlr3c\
;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>
$(SolutionDir)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<ImportLibrary>
$(TargetDir)$(TargetName)_dll.lib
</ImportLibrary>
</Link>
<CustomBuild>
...
...
@@ -242,7 +242,7 @@
<Outputs>
$(ProjectDir)..\..\..\src\belle_sip_messageLexer.c;$(ProjectDir)..\..\..\src\belle_sip_messageLexer.h;$(ProjectDir)..\..\..\src\belle_sip_messageParser.c;$(ProjectDir)..\..\..\src\belle_sip_messageParser.h
</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ItemGroup
Condition=
"'$(Platform)'=='ARM'"
>
<Reference
Include=
"Windows"
>
<IsWinMDFile>
true
</IsWinMDFile>
</Reference>
...
...
@@ -257,7 +257,7 @@
</ProjectReference>
</ItemGroup>
<Import
Project=
"$(VCTargetsPath)\Microsoft.Cpp.targets"
/>
<Import
Project=
"$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets"
/>
<Import
Project=
"$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets"
Condition=
"'$(Platform)'=='ARM'"
/>
<ImportGroup
Label=
"ExtensionTargets"
>
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
src/belle_sip_utils.c
View file @
c82f25ab
...
...
@@ -495,7 +495,7 @@ uint64_t belle_sip_time_ms(void){
}
#else
uint64_t
belle_sip_time_ms
(
void
){
#if WINAPI_FAMILY_APP
#if
def
WINAPI_FAMILY_
PHONE_
APP
return
GetTickCount64
();
#else
return
GetTickCount
();
...
...
src/dns.c
View file @
c82f25ab
...
...
@@ -72,7 +72,7 @@
#endif
#include <winsock2.h>
#include <ws2tcpip.h>
#if
!
WINAPI_FAMILY_APP
#if
ndef
WINAPI_FAMILY_
PHONE_
APP
#include <IPHlpApi.h>
#pragma comment(lib, "IPHLPAPI.lib")
#endif
...
...
@@ -4293,7 +4293,7 @@ int dns_resconf_loadpath(struct dns_resolv_conf *resconf, const char *path) {
#ifdef _WIN32
int
dns_resconf_loadwin
(
struct
dns_resolv_conf
*
resconf
)
{
#if WINAPI_FAMILY_APP
#if
def
WINAPI_FAMILY_
PHONE_
APP
const
char
*
const
nameservers
[]
=
{
"8.8.8.8"
,
"8.8.4.4"
...
...
src/port.c
View file @
c82f25ab
...
...
@@ -68,7 +68,7 @@ const char *belle_sip_get_socket_error_string_from_code(int code){
return
(
const
char
*
)
msgBuf
;
}
#if WINAPI_FAMILY_APP
#if
def
WINAPI_FAMILY_
PHONE_
APP
void
belle_sip_sleep
(
unsigned
int
ms
)
{
HANDLE
sleepEvent
=
CreateEventEx
(
NULL
,
NULL
,
CREATE_EVENT_MANUAL_RESET
,
EVENT_ALL_ACCESS
);
if
(
!
sleepEvent
)
...
...
src/port.h
View file @
c82f25ab
...
...
@@ -83,7 +83,7 @@ static inline int get_socket_error(void){
const
char
*
belle_sip_get_socket_error_string
();
const
char
*
belle_sip_get_socket_error_string_from_code
(
int
code
);
#if WINAPI_FAMILY_APP
#if
def
WINAPI_FAMILY_
PHONE_
APP
BELLESIP_INTERNAL_EXPORT
void
belle_sip_sleep
(
unsigned
int
ms
);
#else
#define belle_sip_sleep Sleep
...
...
tester/belle_sip_tester.c
View file @
c82f25ab
...
...
@@ -101,7 +101,7 @@ int belle_sip_tester_run_tests(char *suite_name, char *test_name) {
}
#if
!
WINAPI_FAMILY_APP
#if
ndef
WINAPI_FAMILY_
PHONE_
APP
int
main
(
int
argc
,
char
*
argv
[])
{
int
i
;
char
*
suite_name
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment