Fix autoconf-related #ifdefs in dlls/kernel.comm.c

Gerald Pfeifer gerald at pfeifer.com
Fri Aug 5 05:43:50 CDT 2005


On FreeBSD, I spotted the following build failures:

  comm.c: In function `COMM_WaitCommEvent':
  comm.c:2061: error: label `error' used but not defined

Fortunately, Uwe did a great job of autoconf-ing this code (Thanks!),
so fixing this was easy.

ChangeLog:
Fix autoconf-related #ifdefs in Comm_CheckEvents().
Index: comm.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/comm.c,v
retrieving revision 1.95
diff -u -3 -p -r1.95 comm.c
--- comm.c	3 Aug 2005 15:43:17 -0000	1.95
+++ comm.c	5 Aug 2005 09:49:58 -0000
@@ -1949,7 +1949,7 @@ static DWORD WINAPI Comm_CheckEvents(int
 	    WARN("TIOCSERGETLSR returned error\n");
 	if (queue)
 /* TIOCINQ only checks for an empty buffer */
-#elif def(TIOCINQ)
+#elif defined(TIOCINQ)
 	if(ioctl(fd, TIOCOUTQ, &queue))
 	    WARN("TIOCOUTQ returned error\n");
 	if (!queue)
@@ -2101,7 +2101,7 @@ static BOOL COMM_WaitCommEvent(
 	res = FALSE;
     }
     return res;
-#if !defined(TIOCINQ) || (!(defined(TIOCSERGETLSR) && defined(TIOCSER_TEMT)) && !defined(TIOCINQ)) || !defined(TIOCMGET) || !defined(TIOCM_CTS) ||!defined(TIOCM_DSR) || !defined(TIOCM_RNG) || !defined(TIOCM_CAR)
+#if !defined(TIOCINQ) || (!(defined(TIOCSERGETLSR) && defined(TIOCSER_TEMT)) || !defined(TIOCINQ)) || !defined(TIOCMGET) || !defined(TIOCM_CTS) ||!defined(TIOCM_DSR) || !defined(TIOCM_RNG) || !defined(TIOCM_CAR)
  error:
     FIXME("Returning error because of missing capabilities\n");
     HeapFree(GetProcessHeap(), 0, commio );



More information about the wine-patches mailing list