diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-05 03:07:02 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:33 +0200 |
| commit | 0a84291cf6aa7c700c6dcb609647b24e3855c31e (patch) | |
| tree | 88cd93437a292dda999e82347c91e834edb2018f /onlineupdate/source | |
| parent | f8952eb7f3d6cabc8469ba0a53e05f0855527b62 (diff) | |
extract string typedefs to a shared file
Change-Id: I6e5d7c828f56b6a3f562ed8a9dd5f63a9d603ce0
Diffstat (limited to 'onlineupdate/source')
| -rw-r--r-- | onlineupdate/source/update/common/readstrings.h | 7 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/archivereader.h | 7 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/progressui.h | 3 |
3 files changed, 3 insertions, 14 deletions
diff --git a/onlineupdate/source/update/common/readstrings.h b/onlineupdate/source/update/common/readstrings.h index bc837ef326b5..747081394c10 100644 --- a/onlineupdate/source/update/common/readstrings.h +++ b/onlineupdate/source/update/common/readstrings.h @@ -11,14 +11,9 @@ #ifdef _WIN32 # include <windows.h> -typedef WCHAR NS_tchar; -#else -typedef char NS_tchar; #endif -#ifndef NULL -#define NULL 0 -#endif +#include "types.hxx" struct StringTable { diff --git a/onlineupdate/source/update/updater/archivereader.h b/onlineupdate/source/update/updater/archivereader.h index 9b7885dc0103..090b787f9cf5 100644 --- a/onlineupdate/source/update/updater/archivereader.h +++ b/onlineupdate/source/update/updater/archivereader.h @@ -9,12 +9,7 @@ #include <stdio.h> #include <onlineupdate/mar.h> - -#ifdef _WIN32 -typedef WCHAR NS_tchar; -#else -typedef char NS_tchar; -#endif +#include "types.hxx" // This class provides an API to extract files from an update archive. class ArchiveReader diff --git a/onlineupdate/source/update/updater/progressui.h b/onlineupdate/source/update/updater/progressui.h index 455ae125180a..cb1468d3949c 100644 --- a/onlineupdate/source/update/updater/progressui.h +++ b/onlineupdate/source/update/updater/progressui.h @@ -8,12 +8,11 @@ #define PROGRESSUI_H__ #include "updatedefines.h" +#include "types.hxx" #if defined(_WIN32) -typedef WCHAR NS_tchar; #define NS_main wmain #else -typedef char NS_tchar; #define NS_main main #endif |