* Makefile.common (CFLAGS_COMMON): Add temporary define to work around w32api

problem.

* cygwin/winlean.h: Define constant which will be needed eventually.  Remove
hack in favor of another hack.
* cygwin/lib/crt0.h: Use "winlean.h".
This commit is contained in:
Christopher Faylor 2012-07-30 04:43:22 +00:00
parent 413ce08289
commit 7d8b0c8447
5 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2012-07-30 Christopher Faylor <me.cygwin2012@cgf.cx>
* Makefile.common (CFLAGS_COMMON): Add temporary define to work around
w32api problem.
2012-07-06 Corinna Vinschen <corinna@vinschen.de>
* Makefile.common (ALL_CFLAGS): Change := to = to allow overriding in

View File

@ -1,6 +1,6 @@
# Makefile.common - common definitions for the winsup directory
#
# Copyright 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2012 Red Hat, Inc.
#
# This file is part of Cygwin.
#
@ -10,7 +10,7 @@
# This makefile requires GNU make.
CFLAGS_COMMON:=-Wall -Wstrict-aliasing -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0# -finline-functions
CFLAGS_COMMON:=-Wall -Wstrict-aliasing -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0 -D_SDKDDKVER_H
MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/uberbaum/winsup/cygwin/dlmalloc
MALLOC_OBJ:=#/cygnus/src/uberbaum/winsup/cygwin/dlmalloc/malloc.o

View File

@ -1,3 +1,9 @@
2012-07-30 Christopher Faylor <me.cygwin2012@cgf.cx>
* winlean.h: Define constant which will be needed eventually. Remove
hack in favor of another hack.
* lib/crt0.h: Use "winlean.h".
2012-07-30 Christopher Faylor <me.cygwin2012@cgf.cx>
* winlean.h: Add temporary define.

View File

@ -12,7 +12,7 @@ details. */
extern "C" {
#endif
#include <windows.h>
#include "winlean.h"
struct per_process;
typedef int (*MainFunc) (int argc, char *argv[], char **env);
int __stdcall _cygwin_crt0_common (MainFunc, struct per_process *);

View File

@ -34,7 +34,8 @@ details. */
#define _WINMM_
#define WINIMPM
#define WINSOCK_API_LINKAGE
#define _SDKDDKVER_H /* temporary until sdkddkver.h problems are worked out */
#define NTDDI_VERSION 0x6020000 /* Probably should just be derived from our
_WIN32_WINNT setting in winsup.h */
/* Windows headers define a couple of annoyingly intrusive macros for the
sole purpose of inline documentation. Since they are defined without