Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/dix/dispatch.c

1 files changed, 6 insertions, 6 deletions

diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c
index dfccc60f6..e9bf3aadf 100644
--- a/mesalib/src/mesa/program/prog_print.c
+++ b/mesalib/src/mesa/program/prog_print.c
@@ -157,11 +157,11 @@ arb_input_attrib_string(GLint index, GLenum progType)
    assert(strcmp(vertAttribs[VERT_ATTRIB_GENERIC15], "vertex.attrib[15]") == 0);
 
    if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertAttribs) / sizeof(vertAttribs[0]));
+      assert(index < Elements(vertAttribs));
       return vertAttribs[index];
    }
    else {
-      assert(index < sizeof(fragAttribs) / sizeof(fragAttribs[0]));
+      assert(index < Elements(fragAttribs));
       return fragAttribs[index];
    }
 }
@@ -246,11 +246,11 @@ arb_output_attrib_string(GLint index, GLenum progType)
    };
 
    if (progType == GL_VERTEX_PROGRAM_ARB) {
-      assert(index < sizeof(vertResults) / sizeof(vertResults[0]));
+      assert(index < Elements(vertResults));
       return vertResults[index];
    }
    else {
-      assert(index < sizeof(fragResults) / sizeof(fragResults[0]));
+      assert(index < Elements(fragResults));
       return fragResults[index];
    }
 }
@@ -925,8 +925,8 @@ _mesa_fprint_program_parameters(FILE *f,
 {
    GLuint i;
 
-   fprintf(f, "InputsRead: 0x%x (0b%s)\n",
-                 prog->InputsRead, binary(prog->InputsRead));
+   fprintf(f, "InputsRead: 0x%llx (0b%s)\n",
+           (unsigned long long) prog->InputsRead, binary(prog->InputsRead));
    fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",
                  (unsigned long long)prog->OutputsWritten, 
 		 binary(prog->OutputsWritten));