Merge remote-tracking branch 'origin/released'

4 files changed, 5 insertions, 3 deletions

diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
index 1419a7cc1..b93989f75 100755
--- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py
@@ -574,7 +574,7 @@ generic_%u_byte( GLint rop, const void * ptr )
         print '    struct glx_context * const gc = __glXGetCurrentContext();'
 
         # The only reason that single and vendor private commands need
-        # a variable called 'dpy' is becuase they use the SyncHandle
+        # a variable called 'dpy' is because they use the SyncHandle
         # macro.  For whatever brain-dead reason, that macro is hard-
         # coded to use a variable called 'dpy' instead of taking a
         # parameter.
diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_size.py b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
index 26a2fdf36..b10c26fc3 100755
--- a/mesalib/src/mapi/glapi/gen/glX_proto_size.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
@@ -57,7 +57,7 @@ class glx_enum_function(object):
         # Fill self.count and self.enums using the dictionary of enums
         # that was passed in.  The generic Get functions (e.g.,
         # GetBooleanv and friends) are handled specially here.  In
-        # the data the generic Get functions are refered to as "Get".
+        # the data the generic Get functions are referred to as "Get".
 
         if func_name in ["GetIntegerv", "GetBooleanv", "GetFloatv", "GetDoublev"]:
             match_name = "Get"
diff --git a/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py b/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py
index 5a69e0343..7afc2b108 100644
--- a/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py
+++ b/mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py
@@ -187,7 +187,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
         # The x86-64 ABI divides function parameters into a couple
         # classes.  For the OpenGL interface, the only ones that are
-        # relevent are INTEGER and SSE.  Basically, the first 8
+        # relevant are INTEGER and SSE.  Basically, the first 8
         # GLfloat or GLdouble parameters are placed in %xmm0 - %xmm7,
         # the first 6 non-GLfloat / non-GLdouble parameters are placed
         # in registers listed in int_parameters.
diff --git a/mesalib/src/mapi/glapi/glapi_entrypoint.c b/mesalib/src/mapi/glapi/glapi_entrypoint.c
index 7facd8aca..f1f7f5e59 100644
--- a/mesalib/src/mapi/glapi/glapi_entrypoint.c
+++ b/mesalib/src/mapi/glapi/glapi_entrypoint.c
@@ -29,6 +29,8 @@
  */
 
 
+#include <string.h>
+
 #include "c11/threads.h"
 #include "glapi/glapi_priv.h"
 #include "u_execmem.h"