winlayer.c fails to build

[Harold Hunt]

Alan,

> Harold - I won't commit your latest patch until we can work with Keith
> on these issues and get some feedback from him. This o.k ?

That sounds fine.  I don't tend to get a lot of response from the XFree86
devel list, but I'm sure you'll be able to bring this to Keith's attention
:)

The minor patch to include/windowstr.h is unrelated and can be committed.

Harold