diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-07-12 10:33:54 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-07-12 10:33:54 +0000 |
| commit | 568e72f5615151ca372f469780b09006023f13af (patch) | |
| tree | d9a8f93e43013c9a8b6f6395eb52289885f9d1fb | |
| parent | 6e1e3bb8e55374b16c2d57297066b088c0cda9a0 (diff) | |
| download | cygnal-568e72f5615151ca372f469780b09006023f13af.tar.gz cygnal-568e72f5615151ca372f469780b09006023f13af.tar.bz2 cygnal-568e72f5615151ca372f469780b09006023f13af.zip | |
* pseudo-reloc.cc: Drop including wchar.h.
(__report_error): Define module as WCHAR.
* advapi.cc: Drop including wchar.h.
* kernel32.cc: Ditto.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/advapi32.cc | 1 | ||||
| -rw-r--r-- | winsup/cygwin/kernel32.cc | 1 | ||||
| -rw-r--r-- | winsup/cygwin/pseudo-reloc.cc | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d9c5d2c8b..32af7b802 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2012-07-12 Corinna Vinschen <corinna@vinschen.de> + + * pseudo-reloc.cc: Drop including wchar.h. + (__report_error): Define module as WCHAR. + * advapi.cc: Drop including wchar.h. + * kernel32.cc: Ditto. + 2012-07-11 Corinna Vinschen <corinna@vinschen.de> * cygtls.cc (well_known_dlls): Add ole32.dll and wbemprox.dll. diff --git a/winsup/cygwin/advapi32.cc b/winsup/cygwin/advapi32.cc index 1b31c6597..efc7c3873 100644 --- a/winsup/cygwin/advapi32.cc +++ b/winsup/cygwin/advapi32.cc @@ -12,7 +12,6 @@ details. */ #include <winioctl.h> #include "shared_info.h" #include "ntdll.h" -#include <wchar.h> #define DEFAULT_NTSTATUS_TO_BOOL_RETURN \ if (!NT_SUCCESS (status)) \ diff --git a/winsup/cygwin/kernel32.cc b/winsup/cygwin/kernel32.cc index 9f9aa2784..e95a43121 100644 --- a/winsup/cygwin/kernel32.cc +++ b/winsup/cygwin/kernel32.cc @@ -11,7 +11,6 @@ details. */ #include "winsup.h" #include "shared_info.h" #include "ntdll.h" -#include <wchar.h> /* Implement CreateEvent/OpenEvent so that named objects are always created in Cygwin shared object namespace. */ diff --git a/winsup/cygwin/pseudo-reloc.cc b/winsup/cygwin/pseudo-reloc.cc index 06d3356c7..04d5d9862 100644 --- a/winsup/cygwin/pseudo-reloc.cc +++ b/winsup/cygwin/pseudo-reloc.cc @@ -20,8 +20,6 @@ # define NO_COPY #else # include "winsup.h" -# include <wchar.h> -# include <ntdef.h> # include <sys/cygwin.h> /* custom status code: */ # define STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION ((NTSTATUS) 0xe0000269) @@ -87,7 +85,7 @@ __report_error (const char *msg, ...) * cygwin ptys. */ char buf[128]; - wchar_t module[MAX_PATH]; + WCHAR module[MAX_PATH]; char * posix_module = NULL; static const char UNKNOWN_MODULE[] = "<unknown module>: "; static const char CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: "; |