From 13cad2fb55d93366be988675ee50b784757f0096 Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Sun, 30 Nov 2014 20:08:20 +0000 Subject: [PATCH] #5722: Rename remaining WIN32 uses to _WIN32 --- libtransmission/file-test.c | 12 ++++++------ libtransmission/file.h | 2 +- libtransmission/platform.c | 2 +- libtransmission/utils.c | 2 +- libtransmission/utils.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libtransmission/file-test.c b/libtransmission/file-test.c index a481eae10..c4be94cf4 100644 --- a/libtransmission/file-test.c +++ b/libtransmission/file-test.c @@ -9,7 +9,7 @@ #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include @@ -23,7 +23,7 @@ #include "libtransmission-test.h" -#ifndef WIN32 +#ifndef _WIN32 #define NATIVE_PATH_SEP "/" #else #define NATIVE_PATH_SEP "\\" @@ -42,7 +42,7 @@ create_test_dir (const char * name) static bool create_symlink (const char * dst_path, const char * src_path, bool dst_is_dir) { -#ifndef WIN32 +#ifndef _WIN32 (void) dst_is_dir; @@ -71,7 +71,7 @@ create_symlink (const char * dst_path, const char * src_path, bool dst_is_dir) static bool create_hardlink (const char * dst_path, const char * src_path) { -#ifndef WIN32 +#ifndef _WIN32 return link (src_path, dst_path) != -1; @@ -109,7 +109,7 @@ path_contains_no_symlinks (const char * path) char * pathPart; const char * slashPos = strchr (p, '/'); -#ifdef WIN32 +#ifdef _WIN32 const char * backslashPos = strchr (p, '\\'); if (slashPos == NULL || (backslashPos != NULL && backslashPos < slashPos)) @@ -617,7 +617,7 @@ test_path_basename_dirname (void) check_streq (".", name); tr_free (name); -#ifdef WIN32 +#ifdef _WIN32 name = tr_sys_path_basename ("c:\\a\\b\\c", &err); check (name != NULL); diff --git a/libtransmission/file.h b/libtransmission/file.h index badaf36cd..e24c072b1 100644 --- a/libtransmission/file.h +++ b/libtransmission/file.h @@ -13,7 +13,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #endif diff --git a/libtransmission/platform.c b/libtransmission/platform.c index efdb397c6..1fea9d610 100644 --- a/libtransmission/platform.c +++ b/libtransmission/platform.c @@ -268,7 +268,7 @@ getHomeDir (void) return home; } -#if defined (__APPLE__) || defined (WIN32) +#if defined (__APPLE__) || defined (_WIN32) #define RESUME_SUBDIR "Resume" #define TORRENT_SUBDIR "Torrents" #else diff --git a/libtransmission/utils.c b/libtransmission/utils.c index 5949c4235..4c0792d3e 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -1128,7 +1128,7 @@ tr_utf8clean (const char * str, int max_len) return ret; } -#ifdef WIN32 +#ifdef _WIN32 char * tr_win32_native_to_utf8 (const wchar_t * text, diff --git a/libtransmission/utils.h b/libtransmission/utils.h index c6783796e..8cda66f8c 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -179,7 +179,7 @@ void tr_wait_msec (long int delay_milliseconds); */ char* tr_utf8clean (const char * str, int len) TR_GNUC_MALLOC; -#ifdef WIN32 +#ifdef _WIN32 char * tr_win32_native_to_utf8 (const wchar_t * text, int text_size); -- 2.40.0