From 2375fa9d1eaa3aacb08ed9c27a5cde3de0db1e50 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Wed, 5 Jan 2022 18:03:39 -0600
Subject: [PATCH] gss: Too many compilers don't support 'restrict'

---
 lib/gssapi/krb5/name_attrs.c | 8 ++++----
 windows/NTMakefile.w32       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/gssapi/krb5/name_attrs.c b/lib/gssapi/krb5/name_attrs.c
index d8298a951..0592f1a25 100644
--- a/lib/gssapi/krb5/name_attrs.c
+++ b/lib/gssapi/krb5/name_attrs.c
@@ -102,10 +102,10 @@ attr_eq(gss_buffer_t attr, const char *aname, size_t aname_len,
 
 /* Split attribute into prefix, suffix, and fragment.  See RFC6680. */
 static void
-split_attr(restrict gss_const_buffer_t orig,
-           restrict gss_buffer_t prefix,
-           restrict gss_buffer_t attr,
-           restrict gss_buffer_t frag,
+split_attr(gss_const_buffer_t orig,
+           gss_buffer_t prefix,
+           gss_buffer_t attr,
+           gss_buffer_t frag,
            int *is_urn)
 {
     char *last = NULL;
diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index 70d83ef1b..471e78391 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -160,7 +160,7 @@ pthreadinc= -I$(PTHREAD_INC)
 # Build options
 
 cincdirs=$(cincdirs) -I$(INCDIR) -I$(INCDIR)\krb5 $(pthreadinc)
-cdefines=$(cdefines) -DHAVE_CONFIG_H -Drestrict=
+cdefines=$(cdefines) -DHAVE_CONFIG_H
 # Windows CNG provider
 cdefines=$(cdefines) -DHCRYPTO_DEF_PROVIDER=w32crypto
 cdebug=$(cdebug) /Zi