merge XFree86 4.3.0.1 to -CURRENT

include/extension.h

@@ -45,6 +45,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
+
 #ifndef EXTENSION_H
 #define EXTENSION_H 
 
@@ -69,6 +71,8 @@ extern void InitExtensions(
 #endif
 );
 
+extern void InitVisualWrap(void);
+
 extern void CloseDownExtensions(
 #if NeedFunctionPrototypes
     void