merge XFree86 4.3.0.1 to -CURRENT

include/miscstruct.h

@@ -45,6 +45,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */
+
 #ifndef MISCSTRUCT_H
 #define MISCSTRUCT_H 1
 
@@ -61,7 +63,11 @@ typedef union _DevUnion {
     pointer		ptr;
     long		val;
     unsigned long	uval;
-    pointer		(*fptr)();
+    pointer		(*fptr)(
+#if NeedFunctionPrototypes
+                        void
+#endif
+                        );
 } DevUnion;
 
 #endif /* MISCSTRUCT_H */