Last header patch for Mingw32 I think (wingdi.h)

[Steven Edwards]

cvs diff -u wingdi.h 
Index: wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.69
diff -u -r1.69 wingdi.h
--- wingdi.h	3 Apr 2002 22:08:27 -0000	1.69
+++ wingdi.h	25 Apr 2002 16:48:19 -0000
@@ -24,6 +24,14 @@
 extern "C" {
 #endif

+#ifdef __MINGW__
+#undef _MAX_PATH
+#undef _MAX_DIR
+#undef _MAX_EXT
+#undef _MAX_DRIVE
+#include "stdlib.h"
+#endif
+
 typedef struct _ABCFLOAT {
     FLOAT   abcfA;
     FLOAT   abcfB;

"Every revolution was once a thought in one man's mind"
- Ralph Waldo Emerson

[Alexandre Julliard]

"Steven Edwards"  writes:
> diff -u -r1.69 wingdi.h
> --- wingdi.h	3 Apr 2002 22:08:27 -0000	1.69
> +++ wingdi.h	25 Apr 2002 16:48:19 -0000
> @@ -24,6 +24,14 @@
>  extern "C" {
>  #endif
>
> +#ifdef __MINGW__
> +#undef _MAX_PATH
> +#undef _MAX_DIR
> +#undef _MAX_EXT
> +#undef _MAX_DRIVE
> +#include "stdlib.h"
> +#endif
> -

Why do you need stdlib.h in wingdi.h?  It's not there under Windows.

[Steven Edwards]

> > diff -u -r1.69 wingdi.h
> > --- wingdi.h	3 Apr 2002 22:08:27 -0000	1.69
> > +++ wingdi.h	25 Apr 2002 16:48:19 -0000
> > @@ -24,6 +24,14 @@
> >  extern "C" {
> >  #endif
> >
> > +#ifdef __MINGW__
> > +#undef _MAX_PATH
> > +#undef _MAX_DIR
> > +#undef _MAX_EXT
> > +#undef _MAX_DRIVE
> > +#include "stdlib.h"
> > +#endif
> > -
>
> Why do you need stdlib.h in wingdi.h?  It's not there under Windows.
>
> -- 
> Alexandre Julliard

I think I needed it there for another define of MAX_PATH. stdlib.h does
exist in mingw. Do you think I should just use wines windef.h and
disregard this? I guess there could be a configure check for the MAX_*
definitions also.

Steve

"Every revolution was once a thought in one man's mind"
- Ralph Waldo Emerson

[Alexandre Julliard]

"Steven Edwards"  writes:
> I think I needed it there for another define of MAX_PATH. stdlib.h does
> exist in mingw. Do you think I should just use wines windef.h and
> disregard this? I guess there could be a configure check for the MAX_*
> definitions also.

Well, wingdi.h uses MAX_PATH but it's up to the code including it to
make sure that MAX_PATH is defined by including windef.h first. That's
the way it works under Windows. It shouldn't matter whether you
include Wine's or Mingw's windef.h, both should define MAX_PATH.

And note that you can't use configure checks in standard Windows
headers since the app using them may not have a configure script.