From: Vadim Zeitlin Date: Sun, 19 Dec 2004 22:45:08 +0000 (+0000) Subject: IRIX compilation fix: don't redeclare usleep() if HAVE_USLEEP is defined X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d67fee71b8078272308e3d5601cf72c5e19e715b IRIX compilation fix: don't redeclare usleep() if HAVE_USLEEP is defined git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp index 6115ef3330..35a7529461 100644 --- a/src/unix/utilsunx.cpp +++ b/src/unix/utilsunx.cpp @@ -126,9 +126,9 @@ // headers - please add your system here if it is the case for your OS. // SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this. #if !defined(HAVE_USLEEP) && \ - (defined(__SUN__) && !defined(__SunOs_5_6) && \ + ((defined(__SUN__) && !defined(__SunOs_5_6) && \ !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \ - defined(__osf__) || defined(__EMX__) + defined(__osf__) || defined(__EMX__)) extern "C" { #ifdef __SUN__