Merge remote branch 'alanc/master'
This commit is contained in:
commit
e7dc253452
|
@ -359,7 +359,7 @@ BEGIN {
|
||||||
# skip modifiers, if any
|
# skip modifiers, if any
|
||||||
$n ~ /^\*?(unsigned|const|volatile|struct)$/ ||
|
$n ~ /^\*?(unsigned|const|volatile|struct)$/ ||
|
||||||
# skip pointer
|
# skip pointer
|
||||||
$n ~ /\*$/)
|
$n ~ /^[a-zA-Z0-9_]*\*$/)
|
||||||
n++;
|
n++;
|
||||||
|
|
||||||
# type specifier may not be set, as in
|
# type specifier may not be set, as in
|
||||||
|
@ -367,6 +367,10 @@ BEGIN {
|
||||||
if ($n !~ /[^a-zA-Z0-9_]/)
|
if ($n !~ /[^a-zA-Z0-9_]/)
|
||||||
n++;
|
n++;
|
||||||
|
|
||||||
|
# go back if we are at the parameter list already
|
||||||
|
if ($n ~ /^[(]([^*].*)?$/)
|
||||||
|
n--;
|
||||||
|
|
||||||
# match
|
# match
|
||||||
# extern _X_EXPORT type (* name[])(...)
|
# extern _X_EXPORT type (* name[])(...)
|
||||||
if ($n ~ /^[^a-zA-Z0-9_]+$/)
|
if ($n ~ /^[^a-zA-Z0-9_]+$/)
|
||||||
|
|
|
@ -31,7 +31,7 @@ libxf86config_internal_la_SOURCES = \
|
||||||
$(INTERNAL_SOURCES)
|
$(INTERNAL_SOURCES)
|
||||||
|
|
||||||
libxf86config_a_SOURCES = \
|
libxf86config_a_SOURCES = \
|
||||||
$(TOP_SRCDIR)/os/xprintf.c \
|
$(top_srcdir)/os/xprintf.c \
|
||||||
$(INTERNAL_SOURCES)
|
$(INTERNAL_SOURCES)
|
||||||
libxf86config_a_CFLAGS = $(AM_CFLAGS)
|
libxf86config_a_CFLAGS = $(AM_CFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@ Xvasprintf(char **ret, const char * _X_RESTRICT_KYWD format, va_list va)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
vsnprintf(*ret, size + 1, format, va);
|
vsnprintf(*ret, size + 1, format, va);
|
||||||
ret[size] = 0;
|
(*ret)[size] = 0;
|
||||||
return size;
|
return size;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user