[gentoo-commits] gentoo commit in src/patchsets/glibc/extra/c_stubs: gconv_stubs.c

[Mike Frysinger (vapier)]

vapier      16/02/19 02:22:31

  Modified:             gconv_stubs.c
  Log:
  c_stubs: get it building w/glibc-2.23+

Revision  Changes    Path
1.2                  src/patchsets/glibc/extra/c_stubs/gconv_stubs.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/c_stubs/gconv_stubs.c?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/c_stubs/gconv_stubs.c?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/extra/c_stubs/gconv_stubs.c?r1=1.1&r2=1.2

Index: gconv_stubs.c
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/extra/c_stubs/gconv_stubs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gconv_stubs.c	26 Jun 2006 22:14:01 -0000	1.1
+++ gconv_stubs.c	19 Feb 2016 02:22:31 -0000	1.2
@@ -20,7 +20,11 @@
 #include <features.h>
 #include <string.h>
 #include <wchar.h>
-#include <bits/libc-lock.h>
+#if __GLIBC_PREREQ(2, 23)
+# include <libc-lock.h>
+#else
+# include <bits/libc-lock.h>
+#endif
 #if __GNUC_PREREQ(3, 3)
 # include <gconv_int.h>
 #else