From 81f027f8feada5578908b2f2d18aedec1a99dbb7 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 10 Apr 2002 04:53:37 +0000 Subject: [PATCH] I've fixed the X11 port, so I can remove the (ioctl) hack. This hack turns out to be a bad idea. Many auto configuration scripts will #include a bunch of system headers, run it through cpp and then grep/sed to see if there was really a prototype. The regular expressions that are used to test this didn't accept all possible legal ANSI-C prototypes. In particular, they didn't accept the () around ioctl. Several different programs do this, so eliminating the parans will keep FreeBSD maximally compatible with other systems. Appologies to: obrien (he was right in the end) This potentally breaks some ports (and fixes vim and others that haven't been fixed to deal with the parens). --- sys/sys/ioccom.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h index b767e573d81a..c6e00df0e3f8 100644 --- a/sys/sys/ioccom.h +++ b/sys/sys/ioccom.h @@ -67,12 +67,7 @@ #include __BEGIN_DECLS -/* - * use parens around the ioctl so that people can define ioctl as a macro. - * Note: This will go away in the future, as soon as the current abusers - * have been fixed. - */ -int (ioctl)(int, unsigned long, ...); +int ioctl(int, unsigned long, ...); __END_DECLS #endif