Mailing-List:	contact cygwin-developers-help AT cygwin DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-developers-subscribe AT cygwin DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin-developers/>
List-Post:	<mailto:cygwin-developers AT cygwin DOT com>
List-Help:	<mailto:cygwin-developers-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-developers-owner AT cygwin DOT com
Delivered-To:	mailing list cygwin-developers AT cygwin DOT com
Message-ID:	<077601c21ad6$20cdffd0$6132bc3e@BABEL>
From:	"Conrad Scott" <Conrad DOT Scott AT dsl DOT pipex DOT com>
To:	<cygwin-developers AT cygwin DOT com>
Subject:	winbase.h & EXPCGF
Date:	Sun, 23 Jun 2002 17:50:49 +0100
MIME-Version:	1.0
X-Priority:	3
X-MSMail-Priority:	Normal
X-MIMEOLE:	Produced By Microsoft MimeOLE V6.00.2600.0000
Note-from-DJ:	This may be spam

This is a multi-part message in MIME format.

------=_NextPart_000_0773_01C21ADE.82600D30
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

There's a file "winbase.h" in the cygwin source directory that
"winsup.h" only allows to be included if EXPCGF is #defined. But there
are a lot of files that don't include "winsup.h" and so end up
including the local "winbase.h" unconditionally. I assume this isn't
deliberate but I may be overlooking something.

On the assumption that it *is* accidental, I've attached a patch that
moves the #ifdef EXPCGF test into "winbase.h" itself, which fixes it.

Nb. The files that currently see the contents of the local "winbase.h"
are:

automode.c
binmode.c
cygrun.c
cygserver.cc
cygserver_client.cc
cygserver_process.cc
cygserver_shm.cc
cygserver_transport.cc
cygserver_transport_pipes.cc
cygserver_transport_sockets.cc
cygwin_attach_dll.c
cygwin_crt0.c
dll_entry.c
dll_main.cc
gmon.c
libcmain.c
profil.c
textmode.c
threaded_queue.cc

// Conrad



------=_NextPart_000_0773_01C21ADE.82600D30
Content-Type: text/plain;
	name="ChangeLog.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="ChangeLog.txt"

2002-06-23  Conrad Scott  <conrad DOT scott AT dsl DOT pipex DOT com>

	* winsup.h: Move #ifdef EXPCGF code into "winbase.h".
	* winbase.h: #ifdef EXPCGF code moved here from "winsup.h".

------=_NextPart_000_0773_01C21ADE.82600D30
Content-Type: application/octet-stream;
	name="winbase.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="winbase.patch"

Index: winsup.h=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
RCS file: /cvs/src/src/winsup/cygwin/winsup.h,v=0A=
retrieving revision 1.69.2.5=0A=
diff -u -r1.69.2.5 winsup.h=0A=
--- winsup.h	13 Jun 2002 14:34:14 -0000	1.69.2.5=0A=
+++ winsup.h	23 Jun 2002 16:20:27 -0000=0A=
@@ -25,13 +25,6 @@=0A=
 =0A=
 #define NO_COPY __attribute__((nocommon)) =
__attribute__((section(".data_cygwin_nocopy")))=0A=
 =0A=
-#ifdef EXPCGF=0A=
-#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused))=0A=
-#else=0A=
-#define DECLARE_TLS_STORAGE do {} while (0)=0A=
-#define _WINBASE2_H=0A=
-#endif=0A=
-=0A=
 #ifdef __cplusplus=0A=
 =0A=
 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ >=3D 199900L=0A=
Index: winbase.h=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
RCS file: /cvs/src/src/winsup/cygwin/winbase.h,v=0A=
retrieving revision 1.2.16.1=0A=
diff -u -r1.2.16.1 winbase.h=0A=
--- winbase.h	4 Jan 2002 03:56:11 -0000	1.2.16.1=0A=
+++ winbase.h	23 Jun 2002 16:20:27 -0000=0A=
@@ -1,5 +1,12 @@=0A=
 #include_next "winbase.h"=0A=
 =0A=
+#ifdef EXPCGF=0A=
+#define DECLARE_TLS_STORAGE char **tls[4096] __attribute__ ((unused))=0A=
+#else=0A=
+#define DECLARE_TLS_STORAGE do {} while (0)=0A=
+#define _WINBASE2_H=0A=
+#endif=0A=
+=0A=
 #ifndef _WINBASE2_H=0A=
 #define _WINBASE2_H=0A=
 =0A=

------=_NextPart_000_0773_01C21ADE.82600D30--

- Raw text -