Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
ca434330
Commit
ca434330
authored
Dec 22, 2007
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
services_discovery/sap.c: s/min/min_int/ to prevent a macro collision on windows environment.
parent
3d979f8e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
modules/services_discovery/sap.c
modules/services_discovery/sap.c
+3
-3
No files found.
modules/services_discovery/sap.c
View file @
ca434330
...
@@ -277,7 +277,7 @@ struct demux_sys_t
...
@@ -277,7 +277,7 @@ struct demux_sys_t
static
int
Decompress
(
const
unsigned
char
*
psz_src
,
unsigned
char
**
_dst
,
int
i_len
);
static
int
Decompress
(
const
unsigned
char
*
psz_src
,
unsigned
char
**
_dst
,
int
i_len
);
static
void
FreeSDP
(
sdp_t
*
p_sdp
);
static
void
FreeSDP
(
sdp_t
*
p_sdp
);
static
inline
int
min
(
int
a
,
int
b
)
static
inline
int
min
_int
(
int
a
,
int
b
)
{
{
return
a
>
b
?
b
:
a
;
return
a
>
b
?
b
:
a
;
}
}
...
@@ -608,8 +608,8 @@ static void Run( services_discovery_t *p_sd )
...
@@ -608,8 +608,8 @@ static void Run( services_discovery_t *p_sd )
{
{
/* Compute next timeout */
/* Compute next timeout */
if
(
p_announce
->
i_period_trust
>
5
)
if
(
p_announce
->
i_period_trust
>
5
)
timeout
=
min
((
3
*
p_announce
->
i_period
-
i_last_period
)
/
1000
,
timeout
);
timeout
=
min
_int
((
3
*
p_announce
->
i_period
-
i_last_period
)
/
1000
,
timeout
);
timeout
=
min
((
i_timeout
-
i_last_period
)
/
1000
,
timeout
);
timeout
=
min
_int
((
i_timeout
-
i_last_period
)
/
1000
,
timeout
);
}
}
}
}
...
...
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