diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
| commit | 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac (patch) | |
| tree | 2e8bb660c908b54914abd562af8aafa4a486c846 /libs/libevent | |
| parent | a61c8728b379057fe7f0a0d86fe0b037598229dd (diff) | |
less TCHARs:
- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*
git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'libs/libevent')
| -rw-r--r-- | libs/libevent/src/evdns.c | 2 | ||||
| -rw-r--r-- | libs/libevent/src/evutil.c | 11 | ||||
| -rw-r--r-- | libs/libevent/src/util-internal.h | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/libs/libevent/src/evdns.c b/libs/libevent/src/evdns.c index c4112330a9..f087962336 100644 --- a/libs/libevent/src/evdns.c +++ b/libs/libevent/src/evdns.c @@ -3773,7 +3773,7 @@ load_nameservers_with_getnetworkparams(struct evdns_base *base) } static int -config_nameserver_from_reg_key(struct evdns_base *base, HKEY key, const TCHAR *subkey) +config_nameserver_from_reg_key(struct evdns_base *base, HKEY key, const wchar_t *subkey) { char *buf; DWORD bufsz = 0, type = 0; diff --git a/libs/libevent/src/evutil.c b/libs/libevent/src/evutil.c index 495bfcc029..0ea9bc7521 100644 --- a/libs/libevent/src/evutil.c +++ b/libs/libevent/src/evutil.c @@ -34,7 +34,6 @@ #include <windows.h> #undef WIN32_LEAN_AND_MEAN #include <io.h> -#include <tchar.h> #include <process.h> #undef _WIN32_WINNT /* For structs needed by GetAdaptersAddresses */ @@ -2472,15 +2471,15 @@ evutil_hex_char_to_int_(char c) #ifdef _WIN32 HMODULE -evutil_load_windows_system_library_(const TCHAR *library_name) +evutil_load_windows_system_library_(const wchar_t *library_name) { - TCHAR path[MAX_PATH]; + wchar_t path[MAX_PATH]; unsigned n; n = GetSystemDirectory(path, MAX_PATH); - if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH) + if (n == 0 || n + wcslen(library_name) + 2 >= MAX_PATH) return 0; - _tcscat(path, TEXT("\\")); - _tcscat(path, library_name); + wcscat(path, TEXT("\\")); + wcscat(path, library_name); return LoadLibrary(path); } #endif diff --git a/libs/libevent/src/util-internal.h b/libs/libevent/src/util-internal.h index a6318f2890..61db4e9aca 100644 --- a/libs/libevent/src/util-internal.h +++ b/libs/libevent/src/util-internal.h @@ -52,11 +52,11 @@ extern "C" { /* If we need magic to say "inline", get it for free internally. */ #ifdef EVENT__inline -#if(_MSC_VER < 1900)
+#if(_MSC_VER < 1900) #define inline __inline -#else
+#else #define inline EVENT__inline -#endif
+#endif #endif @@ -398,7 +398,7 @@ void evutil_free_secure_rng_globals_(void); void evutil_free_globals_(void); #ifdef _WIN32 -HMODULE evutil_load_windows_system_library_(const TCHAR *library_name); +HMODULE evutil_load_windows_system_library_(const wchar_t *library_name); #endif #ifndef EV_SIZE_FMT |