[Improved PATCH] corrects search order of directories for include files for gcc 3.2

[Andre Bleau <cygwin-apps at cygwin dot com>]

This is a follow up to: http://cygwin.com/ml/cygwin/2003-03/msg00271.html

I improved my patch so that /usr/include/w32api is not searched at all if 
-mno-win32 is specified. Search list would now be:

gcc -mno-cygwin : (same as now)
 /usr/i686-pc-mingw32/lib/../../include/w32api
 /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
 /usr/include/mingw

gcc -mwin32 : (same as now)
 /usr/i686-pc-mingw32/lib/../../include/w32api
 /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
 /usr/include

gcc -mno-win32 : (same as now)
 /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
 /usr/include

"plain" gcc or gcc -mcygwin : (/usr/i686-pc-cygwin/lib/../../include/w32api 
moved from first to last position)
 /usr/lib/gcc-lib/i686-pc-cygwin/3.2/include
 /usr/include
 /usr/i686-pc-cygwin/lib/../../include/w32api

I tested the patch by modifying the specs file by hand.

The patch is for /usr/src/gcc-3.2-3/gcc/config/i386/cygwin.h
----------------------------------------------------------------
$ diff -up cygwin.h.orig cygwin.h
--- cygwin.h.orig       2003-03-04 15:08:38.000000000 -0500
+++ cygwin.h    2003-03-05 17:29:07.000000000 -0500
@@ -44,7 +44,8 @@ Boston, MA 02111-1307, USA.  */
   %{mno-cygwin:-D__MSVCRT__ -D__MINGW32__ %{!ansi:%{mthreads:-D_MT}}}\
   %{!mno-cygwin:-D__CYGWIN32__ -D__CYGWIN__ %{!ansi:-Dunix} -D__unix__ 
-D__unix }\
   %{mwin32|mno-cygwin:-DWIN32 -D_WIN32 -D__WIN32 -D__WIN32__ 
%{!ansi:-DWINNT}}\

-  %{!nostdinc:%{!mno-win32|mno-cygwin:-isystem ../include/w32api%s 
-isystem ../../include/w32api%s}}\
+  %{!nostdinc:%{mwin32|mno-cygwin:-isystem ../../include/w32api%s}}\
+  %{!nostdinc:%{!mno-win32:%{!mwin32:%{!mno-cygwin:-idirafter 
../../include/w32api%s}}}}\
 "

 #undef STARTFILE_SPEC
----------------------------------------------------------------




André Bleau, Cygwin's OpenGL package maintainer.

email: bleau at igb dot umontreal dot ca
(Fight SPAM: encode your email-address)

Please address all questions and problem reports about Cygwin's OpenGL 
package to cygwin at cygwin dot com . 


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/