libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-07 06:50:24 +08:00
Code Issues Projects Releases Wiki Activity

* winlean.h (__STRALIGN_H_): Drop definition.

Browse Source
This commit is contained in:
Corinna Vinschen 2012-07-06 14:44:13 +00:00
parent e75fa972ac
commit 3eedbf8611
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2012-07-06 Corinna Vinschen <corinna@vinschen.de>
* winlean.h (__STRALIGN_H_): Drop definition.
2012-07-06 Corinna Vinschen <corinna@vinschen.de> 2012-07-06 Corinna Vinschen <corinna@vinschen.de>
* fhandler_procnet.cc: Fix copyright. * fhandler_procnet.cc: Fix copyright.

5
winsup/cygwin/Makefile.in
View File

@ -17,7 +17,6 @@ CC:=@CC@
CC_FOR_TARGET:=$(CC) CC_FOR_TARGET:=$(CC)
srcdir:=@srcdir@ srcdir:=@srcdir@
CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@ CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@
include ${srcdir}/../Makefile.common
SHELL:=@SHELL@ SHELL:=@SHELL@
objdir:=. objdir:=.
@ -29,6 +28,8 @@ build_alias:=@build_alias@
host_alias:=@host_alias@ host_alias:=@host_alias@
prefix:=@prefix@ prefix:=@prefix@
include ${srcdir}/../Makefile.common
program_transform_name:=@program_transform_name@ program_transform_name:=@program_transform_name@
exec_prefix:=@exec_prefix@ exec_prefix:=@exec_prefix@
bindir:=@bindir@ bindir:=@bindir@
@ -130,7 +131,7 @@ EXTRA_OFILES:=
MALLOC_OFILES:=@MALLOC_OFILES@ MALLOC_OFILES:=@MALLOC_OFILES@
DLL_IMPORTS:=$(w32api_lib)/libkernel32.a $(w32api_lib)/libntdll.a DLL_IMPORTS:=$(mingw_lib)/libkernel32.a $(mingw_lib)/libntdll.a
MT_SAFE_OBJECTS:= MT_SAFE_OBJECTS:=
# #

4
winsup/cygwin/configure.in
View File

@ -80,6 +80,10 @@ case "$target_cpu" in
DEF_DLL_ENTRY="dll_entry@12" DEF_DLL_ENTRY="dll_entry@12"
ALLOCA="_alloca" ALLOCA="_alloca"
CONFIG_DIR="i386" ;; CONFIG_DIR="i386" ;;
x86_64) DLL_ENTRY="_dll_entry@12"
DEF_DLL_ENTRY="dll_entry@12"
ALLOCA="_alloca"
CONFIG_DIR="x86_64" ;;
*) AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;; *) AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;;
esac esac

7
winsup/cygwin/mkvers.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# mkvers.sh - Make version information for cygwin DLL # mkvers.sh - Make version information for cygwin DLL
# #
# Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2010 Red Hat, Inc. # Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2010 Red Hat, Inc.
@ -149,6 +149,9 @@ if [ -n "$cvs_tag" ]; then
cygwin_ver="$cygwin_ver-$cvs_tag" cygwin_ver="$cygwin_ver-$cvs_tag"
fi fi
compiler=$(echo "$windres" | sed -e 's/windres/gcc/')
cpu=$("$compiler" -dumpmachine | sed -e 's/\([^-]*\).*/\1/')
echo "Version $cygwin_ver" echo "Version $cygwin_ver"
set -$- $builddate set -$- $builddate
$windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o $windres --include-dir /usr/$cpu-w64-mingw32/sys-root/mingw/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o

2
winsup/cygwin/winlean.h
View File

@ -23,7 +23,6 @@ details. */
#define _WINNLS_ #define _WINNLS_
#define _WINNETWK_ #define _WINNETWK_
#define _WINSVC_ #define _WINSVC_
#define __STRALIGN_H_
#define _ADVAPI32_ #define _ADVAPI32_
#define _DSGETDCAPI_ #define _DSGETDCAPI_
#define _GDI32_ #define _GDI32_
@ -51,7 +50,6 @@ details. */
#undef _WINNLS_ #undef _WINNLS_
#undef _WINNETWK_ #undef _WINNETWK_
#undef _WINSVC_ #undef _WINSVC_
#undef __STRALIGN_H_
/* When Terminal Services are installed, the GetWindowsDirectory function /* When Terminal Services are installed, the GetWindowsDirectory function
does not return the system installation dir, but a user specific directory does not return the system installation dir, but a user specific directory