Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
def05940
Commit
def05940
authored
Aug 18, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redumdant vlc_va_copy() and checks
parent
67fc58a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
38 deletions
+2
-38
configure.ac
configure.ac
+0
-20
src/misc/messages.c
src/misc/messages.c
+2
-18
No files found.
configure.ac
View file @
def05940
...
...
@@ -646,26 +646,6 @@ LIBS_save="${LIBS}"
AC_SEARCH_LIBS([getaddrinfo], [nsl],,, [${SOCKET_LIBS}])
LIBS="${LIBS_save}"
dnl Check for va_copy
AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
AC_TRY_LINK(
[#include <stdarg.h>],
[va_list ap1, ap2; va_copy(ap1,ap2);],
[ac_cv_c_va_copy="yes"],
[ac_cv_c_va_copy="no"]))
if test "${ac_cv_c_va_copy}" = "yes"; then
AC_DEFINE(HAVE_VA_COPY, 1, [Define if <stdarg.h> defines va_copy.])
fi
AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
AC_TRY_LINK(
[#include <stdarg.h>],
[va_list ap1, ap2; __va_copy(ap1,ap2);],
[ac_cv_c___va_copy="yes"],
[ac_cv_c___va_copy="no"]))
if test "${ac_cv_c___va_copy}" = "yes"; then
AC_DEFINE(HAVE___VA_COPY, 1, [Define if <stdarg.h> defines __va_copy.])
fi
AC_CHECK_FUNCS(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,[
VLC_ADD_LIBS([libvlccore],[-lresolv])
...
...
src/misc/messages.c
View file @
def05940
...
...
@@ -55,17 +55,6 @@
#include <vlc_charset.h>
#include "../libvlc.h"
/*****************************************************************************
* Local macros
*****************************************************************************/
#if defined(HAVE_VA_COPY)
# define vlc_va_copy(dest,src) va_copy(dest,src)
#elif defined(HAVE___VA_COPY)
# define vlc_va_copy(dest,src) __va_copy(dest,src)
#else
# define vlc_va_copy(dest,src) (dest)=(src)
#endif
static
inline
msg_bank_t
*
libvlc_bank
(
libvlc_int_t
*
inst
)
{
return
(
libvlc_priv
(
inst
))
->
msg_bank
;
...
...
@@ -251,12 +240,9 @@ void msg_Generic( vlc_object_t *p_this, int i_type, const char *psz_module,
* is full). If the message can't be converted to string in memory, it issues
* a warning.
*/
void
msg_GenericVa
(
vlc_object_t
*
p_this
,
int
i_type
,
const
char
*
psz_module
,
const
char
*
psz_format
,
va_list
_args
)
void
msg_GenericVa
(
vlc_object_t
*
p_this
,
int
i_type
,
const
char
*
psz_module
,
const
char
*
psz_format
,
va_list
args
)
{
va_list
args
;
assert
(
p_this
);
if
(
p_this
->
i_flags
&
OBJECT_FLAGS_QUIET
)
...
...
@@ -328,10 +314,8 @@ void msg_GenericVa (vlc_object_t *p_this, int i_type,
static
const
char
nomemstr
[]
=
"<not enough memory to format message>"
;
char
*
str
;
vlc_va_copy
(
args
,
_args
);
if
(
unlikely
(
vasprintf
(
&
str
,
psz_format
,
args
)
==
-
1
))
str
=
(
char
*
)
nomemstr
;
va_end
(
args
);
uselocale
(
locale
);
freelocale
(
c
);
...
...
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