Delivered-To: listarch-cygwin AT sourceware DOT cygnus DOT com
Mailing-List: contact cygwin-help AT sourceware DOT cygnus DOT com; run by ezmlm
Sender: cygwin-owner AT sourceware DOT cygnus DOT com
Delivered-To: mailing list cygwin AT sourceware DOT cygnus DOT com
Message-ID: <000101be5978$14101b20$8b9eccc2@amd-based-pc>
From: "Krzysztof Nikiel" <krzych00 AT friko7 DOT onet DOT pl>
To: "cygwin mailing list" <cygwin AT sourceware DOT cygnus DOT com>
Subject: B20.1: Windows32 header tiny patch
Date: Mon, 15 Feb 1999 12:02:25 +0100
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 4.72.3110.1
X-MimeOLE: Produced By Microsoft MimeOLE V4.72.3110.3

I have encountered lines in 'Windows32/Functions.h'
which look somewhat strange:

#ifndef UNICODE_ONLY
#include <Windows32/UnicodeFunctions.h>
#endif /* !UNICODE_ONLY */

#ifndef ANSI_ONLY
#include <Windows32/ASCIIFunctions.h>
#endif /* !ANSI_ONLY */

If UNICODE_ONLY is defined then don't include
UnicodeFunctions.h.

It probably should look like this:

#ifndef UNICODE_ONLY
#include <Windows32/ASCIIFunctions.h>
#endif /* !UNICODE_ONLY */

#ifndef ANSI_ONLY
#include <Windows32/UnicodeFunctions.h>
#endif /* !ANSI_ONLY */

If I am right then the following patch should be applied:

************************************************************
*** Functions.h-orig Tue Dec  1 13:42:02 1998
--- Functions.h Mon Feb 15 08:11:56 1999
***************
*** 34,44 ****
  #include <Windows32/CommonFunctions.h>

  #ifndef UNICODE_ONLY
! #include <Windows32/UnicodeFunctions.h>
  #endif /* !UNICODE_ONLY */

  #ifndef ANSI_ONLY
! #include <Windows32/ASCIIFunctions.h>
  #endif /* !ANSI_ONLY */

  /* Define the approprate declaration based upon UNICODE or ASCII */
--- 34,44 ----
  #include <Windows32/CommonFunctions.h>

  #ifndef UNICODE_ONLY
! #include <Windows32/ASCIIFunctions.h>
  #endif /* !UNICODE_ONLY */

  #ifndef ANSI_ONLY
! #include <Windows32/UnicodeFunctions.h>
  #endif /* !ANSI_ONLY */

  /* Define the approprate declaration based upon UNICODE or ASCII */
***************************************************************************














begin 666 Functions.h-diff.gz
M'XL("&X'R#8``&9U;F-T:6]N<RYH+61I9F8`M9%/2\- $,7/S:=XI;?%F&Z2
M2A-$*(F%@*:'6L23I-F)76AW0_[@UW<3I:2B]B#=TYOE[6]VWC#&L&Q5WDBM
MZNN=K2OY-GIJ"3'E``?W0M\-IRYX$,PMV[:'[M&C5EC2%GR&Z3SD/)S==,; 
M8J>GJ^'Y5[Z/O AT 0F4N7[5A!NGZ42^KWV7"?2AX-6`_Z=,?;>0 AT DJL$F3:!7?
MOZ[2AQ=K_"-BHV2N!7UC3$@)6<!A& \98,YI AT T6Z3OZB+]91DOS./CX_ AT LUM
M3(54A&9'R,JRTF65-01!^3XSRG"PS6H2:$LCOWX'7:'OU8&ZS#^C,\J^7'1G
3AOM7<&?7<IGH/@!HT+-9W0(`````
`
end