Initial XFree86 4.0.99.1 merge.

4 files changed, 6 insertions, 7 deletions

diff --git a/xc/extras/Mesa/src/X/xmesa1.c b/xc/extras/Mesa/src/X/xmesa1.c
index 78eb21901..c3cd5cf4f 100644
--- a/xc/extras/Mesa/src/X/xmesa1.c
+++ b/xc/extras/Mesa/src/X/xmesa1.c
@@ -1,3 +1,4 @@
+/* $Id: xmesa1.c,v 1.19 2001/03/19 21:38:52 dawes Exp $ */
 
 /*
  * Mesa 3-D graphics library
diff --git a/xc/extras/Mesa/src/X86/common_x86_asm.S b/xc/extras/Mesa/src/X86/common_x86_asm.S
index 44120051a..f55e9b198 100644
--- a/xc/extras/Mesa/src/X86/common_x86_asm.S
+++ b/xc/extras/Mesa/src/X86/common_x86_asm.S
@@ -32,7 +32,7 @@
  *
  * Cleaned up and simplified by Gareth Hughes <gareth@valinux.com>
  */
-/* $XFree86: xc/extras/Mesa/src/X86/common_x86_asm.S,v 1.5 2000/12/12 23:52:37 dawes Exp $ */
+/* $XFree86: xc/extras/Mesa/src/X86/common_x86_asm.S,v 1.6 2001/01/17 12:50:11 alanh Exp $ */
 
 #include "assyntax.h"
 #include "common_x86_features.h"
@@ -58,10 +58,8 @@
 GLNAME( found_intel ):	STRING( "Genuine Intel processor found\n\0" )
 GLNAME( found_amd ):	STRING( "Authentic AMD processor found\n\0" )
 
-#ifdef USE_KATMAI_ASM
 GLNAME( katmai_test_dummy ):
 	D_LONG 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000
-#endif
 
 
 	SEG_TEXT
@@ -157,7 +155,6 @@ LLBL ( cpuid_done ):
 	RET
 
 
-#ifdef USE_KATMAI_ASM
 /* Execute an SSE instruction to see if the operating system correctly
  * supports SSE.  A signal handler for SIGILL should have been set
  * before calling this function, otherwise this could kill the client
@@ -206,5 +203,3 @@ GLNAME( gl_test_os_katmai_exception_support ):
 
 	LEAVE
 	RET
-
-#endif
diff --git a/xc/extras/Mesa/src/texture.c b/xc/extras/Mesa/src/texture.c
index 6a2b2dfb1..60a5542b8 100644
--- a/xc/extras/Mesa/src/texture.c
+++ b/xc/extras/Mesa/src/texture.c
@@ -104,6 +104,7 @@ typedef void (*build_f_func)( GLfloat *f,
 #define FIRST_NORMAL     normals->start
 #define CUR_NORMAL       (void) normal
 #define NEXT_NORMAL      STRIDE_F(normal, normals->stride)
+#define LOCAL_VARS
 #define CHECK            if (cullmask[i])
 #define LOCAL_VARS       
 #include "texgen_tmp.h"
diff --git a/xc/extras/rman/rman.c b/xc/extras/rman/rman.c
index 32a1c1f59..9d615f4fc 100644
--- a/xc/extras/rman/rman.c
+++ b/xc/extras/rman/rman.c
@@ -16,7 +16,7 @@ static char rcsid[] = "Header: /home/cs/phelps/spine/rman/RCS/rman.c,v 1.144 199
      source interpretation added September 24, 1996
 	renamed PolyglotMan due to lawsuit by Rosetta, Inc. August 8, 1997
 */
-/* $XFree86: xc/extras/rman/rman.c,v 1.12 2000/12/01 18:48:08 dawes Exp $ */
+/* $XFree86: xc/extras/rman/rman.c,v 1.13 2000/12/21 18:55:27 dawes Exp $ */
 
 
 /* TO DO ****
@@ -474,12 +474,14 @@ manrefextract(char *p)
 {
   char *p0;
   static char *nonhref = "\">'";
+  static char *punct = ".,:;)]}?!";
 
   while (*p==' ') p++;
   if (strincmp(p,"http",4)==0) {
 	href="%s"; manrefname = p;
 	p+=4;
 	while (*p && !isspace(*p) && !strchr(nonhref,*p)) p++;
+	while (strchr(punct, *(p - 1))) p--;
   } else {
 	href = manRef;