xorgproto: Branch 'master'

[GitLab Mirror]

 include/X11/Xos.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c3a7302fcc7ecf05960ad1794c5effeda5d4945
Author: Dimitry Andric <dimitry at andric.com>
Date:   Sat May 20 17:13:28 2023 +0200

    Xos.h: include <strings.h> on FreeBSD for index/rindex
    
    Adding index() and rindex() as macros wreaks havoc with several libc++
    headers, which liberally use the name 'index' for variables, functions,
    and more. Get the declarations from <strings.h> instead, where they have
    been for at least two decades.
    
    Signed-off-by:  Dimitry Andric <dimitry at andric.com>

diff --git a/include/X11/Xos.h b/include/X11/Xos.h
index 28dfc67..75cc5b7 100644
--- a/include/X11/Xos.h
+++ b/include/X11/Xos.h
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
  */
 
 # include <string.h>
-# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__)
 #  include <strings.h>
 # else
 #  ifndef index