From mboxrd@z Thu Jan 1 00:00:00 1970 From: bugtrack@alsa-project.org Subject: [ALSA - driver 0000743]: msleep is now defined in linux/include/linux/delay.h causing conflict with macro defined in alsa-driver/include/adriver.h Date: Mon, 31 Jan 2005 19:04:17 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from bugtrack.alsa-project.org (gate.perex.cz [82.113.61.162]) by alsa.alsa-project.org (ALSA's E-mail Delivery System) with ESMTP id E88A9235 for ; Mon, 31 Jan 2005 19:04:17 +0100 (MET) Sender: alsa-devel-admin@lists.sourceforge.net Errors-To: alsa-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , List-Archive: To: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org The following issue has been CLOSED ====================================================================== ====================================================================== Reported By: jdthood Assigned To: perex ====================================================================== Project: ALSA - driver Issue ID: 743 Category: 0_compilation problem_!!! Reproducibility: always Severity: major Priority: normal Status: closed Distribution: Kernel Version: Resolution: fixed Fixed in Version: ====================================================================== Date Submitted: 12-23-2004 22:10 CET Last Modified: 01-31-2005 19:04 CET ====================================================================== Summary: msleep is now defined in linux/include/linux/delay.h causing conflict with macro defined in alsa-driver/include/adriver.h Description: Recent 2.4.29-pre3 patch moves msleep() from include/linux/libata-compat.h to include/linux/delay.h. As a result, alsa-driver 1.0.7 does not compile on 2.4.29-pre3 because it defines its own msleep macro in include/adriver.h. Currently the macro is defined inside #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 6) ... #endif. The code seems to be the same in CVS. I guess this version dependency needs to be updated. gcc -D__KERNEL__ -DMODULE=1 -I/usr/src/modules/alsa-driver/include -I/usr/src/linux-2.4.29/include -I/usr/src/linux-2.4.29/include2 -I/usr/src/linux-2.4.29/include -O2 -mpreferred-stack-boundary=2 -march=i686 -DLINUX -Wall -Wstrict-prototypes -fomit-frame-pointer -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -DALSA_BUILD -nostdinc -iwithprefix include -DEXPORT_SYMTAB -c timer.c In file included from timer.c:23: /usr/src/linux-2.4.29/include/linux/delay.h:57: error: parse error before "do" /usr/src/linux-2.4.29/include/linux/delay.h:57: error: parse error before '(' token /usr/src/linux-2.4.29/include/linux/delay.h:60: error: parse error before '(' token make[4]: *** [timer.o] Error 1 ====================================================================== ---------------------------------------------------------------------- tiwai - 12-27-04 15:10 ---------------------------------------------------------------------- Fixed on CVS. Issue History Date Modified Username Field Change ====================================================================== 12-23-04 22:10 jdthood New Issue 12-27-04 15:10 tiwai Status assigned => resolved 12-27-04 15:10 tiwai Resolution open => fixed 12-27-04 15:10 tiwai Note Added: 0002960 01-31-05 19:04 tiwai Status resolved => closed ====================================================================== ------------------------------------------------------- This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag-&-drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl