diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-11-26 17:13:25 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-11-26 17:13:25 +0400 |
| commit | 3afc3efbab915342c5ad69fb96230b88323da4c6 (patch) | |
| tree | e7d5a021cf0d15fce72a71f860f61aca8af351da /winsup | |
| parent | 6f125cff2b6cf93a9cc021fdf0c2999ce3be1b7c (diff) | |
* bloda.cc: Drop Mingw.org considerations.
* dump_setup.cc: Ditto.
* strace.cc: Ditto.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/bloda.cc | 16 | ||||
| -rw-r--r-- | winsup/utils/dump_setup.cc | 11 | ||||
| -rw-r--r-- | winsup/utils/strace.cc | 6 |
4 files changed, 13 insertions, 26 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 3ece66260..7508ba1ba 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,9 @@ +2012-11-26 Corinna Vinschen <corinna@vinschen.de> + + * bloda.cc: Drop Mingw.org considerations. + * dump_setup.cc: Ditto. + * strace.cc: Ditto. + 2012-11-12 Christopher Faylor <me.cygwin2012@cgf.cx> * aclocal.m4: Regenerate. diff --git a/winsup/utils/bloda.cc b/winsup/utils/bloda.cc index dcb18f1a4..11f3c9af6 100644 --- a/winsup/utils/bloda.cc +++ b/winsup/utils/bloda.cc @@ -1,6 +1,6 @@ /* bloda.cc - Copyright 2007 Red Hat, Inc. + Copyright 2007, 2012 Red Hat, Inc. This file is part of Cygwin. @@ -16,18 +16,8 @@ #include <windows.h> #undef WIN32_NO_STATUS #include <psapi.h> -#ifndef __MINGW64_VERSION_MAJOR -# include <ntdef.h> -# include <ddk/ntstatus.h> -# include <ddk/ntapi.h> -# define SystemProcessInformation SystemProcessesAndThreadsInformation -# define PSYSTEM_PROCESS_INFORMATION PSYSTEM_PROCESSES -# define ImageName ProcessName -# define NextEntryOffset NextEntryDelta -#else -# include <winternl.h> -# include <ntstatus.h> -#endif +#include <winternl.h> +#include <ntstatus.h> #undef cygwin_internal #undef DEBUGGING diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc index bc7a7dab5..7774f5f52 100644 --- a/winsup/utils/dump_setup.cc +++ b/winsup/utils/dump_setup.cc @@ -1,6 +1,6 @@ /* dump_setup.cc - Copyright 2001, 2002, 2003, 2004, 2005, 2008, 2010 Red Hat, Inc. + Copyright 2001, 2002, 2003, 2004, 2005, 2008, 2010, 2012 Red Hat, Inc. This file is part of Cygwin. @@ -20,13 +20,8 @@ details. */ ntstatus.h for extended status codes below. */ #include <windows.h> #undef WIN32_NO_STATUS -#ifndef __MINGW64_VERSION_MAJOR -# include <ddk/ntapi.h> -# include <ddk/winddk.h> -#else -# include <winternl.h> -# include <ntstatus.h> -#endif +#include <winternl.h> +#include <ntstatus.h> #include "path.h" #include <zlib.h> diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc index ab19b9f20..62d408601 100644 --- a/winsup/utils/strace.cc +++ b/winsup/utils/strace.cc @@ -12,11 +12,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include <windows.h> -#ifndef __MINGW64_VERSION_MAJOR -# include "ddk/ntapi.h" -#else -# include <winternl.h> -#endif +#include <winternl.h> #define cygwin_internal cygwin_internal_dontuse #include <stdio.h> #include <fcntl.h> |