summaryrefslogtreecommitdiff
path: root/Xi/extinit.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:07 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:07 +0000
commit0097b6fe2d1739e46e4e7726aaa481b6dc84870c (patch)
tree5e279fda13b69a02c684338ee803defbda33ab08 /Xi/extinit.c
parentc57959ad6a4c0f5329762f401fd7871ffb2ee90c (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'Xi/extinit.c')
-rw-r--r--Xi/extinit.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c
index ce5d96c8a..01d51ba64 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.6 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */
/********************************************************************
*
@@ -894,13 +894,8 @@ MakeDeviceTypeAtoms ()
*/
DeviceIntPtr
-#if NeedFunctionPrototypes
LookupDeviceIntRec (
CARD8 id)
-#else
-LookupDeviceIntRec (id)
- CARD8 id;
-#endif
{
DeviceIntPtr dev;