projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'snapshot-start' into stable
[gnulib.git]
/
lib
/
regex_internal.h
diff --git
a/lib/regex_internal.h
b/lib/regex_internal.h
index
c92fb1a
..
a0eae33
100644
(file)
--- a/
lib/regex_internal.h
+++ b/
lib/regex_internal.h
@@
-1,5
+1,5
@@
/* Extended regular expression matching and search library.
/* Extended regular expression matching and search library.
- Copyright (C) 2002-201
3
Free Software Foundation, Inc.
+ Copyright (C) 2002-201
4
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@
-72,8
+72,9
@@
#else
# define lock_define(name)
# define lock_init(lock) 0
#else
# define lock_define(name)
# define lock_init(lock) 0
-# define lock_fini(lock) 0
-# define lock_lock(lock) ((void) 0)
+# define lock_fini(lock) ((void) 0)
+ /* The 'dfa' avoids an "unused variable 'dfa'" warning from GCC. */
+# define lock_lock(lock) ((void) dfa)
# define lock_unlock(lock) ((void) 0)
#endif
# define lock_unlock(lock) ((void) 0)
#endif
@@
-109,7
+110,7
@@
# define gettext_noop(String) String
#endif
# define gettext_noop(String) String
#endif
-#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE
&& HAVE_WCSCOLL
) || _LIBC
+#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC
# define RE_ENABLE_I18N
#endif
# define RE_ENABLE_I18N
#endif