mirror of
https://github.com/transmission/transmission
synced 2024-12-25 01:03:01 +00:00
#5722: Rename remaining WIN32 uses to _WIN32
This commit is contained in:
parent
e30728367f
commit
13cad2fb55
5 changed files with 10 additions and 10 deletions
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef _WIN32
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
#include "libtransmission-test.h"
|
#include "libtransmission-test.h"
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef _WIN32
|
||||||
#define NATIVE_PATH_SEP "/"
|
#define NATIVE_PATH_SEP "/"
|
||||||
#else
|
#else
|
||||||
#define NATIVE_PATH_SEP "\\"
|
#define NATIVE_PATH_SEP "\\"
|
||||||
|
@ -42,7 +42,7 @@ create_test_dir (const char * name)
|
||||||
static bool
|
static bool
|
||||||
create_symlink (const char * dst_path, const char * src_path, bool dst_is_dir)
|
create_symlink (const char * dst_path, const char * src_path, bool dst_is_dir)
|
||||||
{
|
{
|
||||||
#ifndef WIN32
|
#ifndef _WIN32
|
||||||
|
|
||||||
(void) dst_is_dir;
|
(void) dst_is_dir;
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ create_symlink (const char * dst_path, const char * src_path, bool dst_is_dir)
|
||||||
static bool
|
static bool
|
||||||
create_hardlink (const char * dst_path, const char * src_path)
|
create_hardlink (const char * dst_path, const char * src_path)
|
||||||
{
|
{
|
||||||
#ifndef WIN32
|
#ifndef _WIN32
|
||||||
|
|
||||||
return link (src_path, dst_path) != -1;
|
return link (src_path, dst_path) != -1;
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ path_contains_no_symlinks (const char * path)
|
||||||
char * pathPart;
|
char * pathPart;
|
||||||
const char * slashPos = strchr (p, '/');
|
const char * slashPos = strchr (p, '/');
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
const char * backslashPos = strchr (p, '\\');
|
const char * backslashPos = strchr (p, '\\');
|
||||||
if (slashPos == NULL || (backslashPos != NULL && backslashPos < slashPos))
|
if (slashPos == NULL || (backslashPos != NULL && backslashPos < slashPos))
|
||||||
|
@ -617,7 +617,7 @@ test_path_basename_dirname (void)
|
||||||
check_streq (".", name);
|
check_streq (".", name);
|
||||||
tr_free (name);
|
tr_free (name);
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
name = tr_sys_path_basename ("c:\\a\\b\\c", &err);
|
name = tr_sys_path_basename ("c:\\a\\b\\c", &err);
|
||||||
check (name != NULL);
|
check (name != NULL);
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -268,7 +268,7 @@ getHomeDir (void)
|
||||||
return home;
|
return home;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined (__APPLE__) || defined (WIN32)
|
#if defined (__APPLE__) || defined (_WIN32)
|
||||||
#define RESUME_SUBDIR "Resume"
|
#define RESUME_SUBDIR "Resume"
|
||||||
#define TORRENT_SUBDIR "Torrents"
|
#define TORRENT_SUBDIR "Torrents"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -1128,7 +1128,7 @@ tr_utf8clean (const char * str, int max_len)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
char *
|
char *
|
||||||
tr_win32_native_to_utf8 (const wchar_t * text,
|
tr_win32_native_to_utf8 (const wchar_t * text,
|
||||||
|
|
|
@ -179,7 +179,7 @@ void tr_wait_msec (long int delay_milliseconds);
|
||||||
*/
|
*/
|
||||||
char* tr_utf8clean (const char * str, int len) TR_GNUC_MALLOC;
|
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,
|
char * tr_win32_native_to_utf8 (const wchar_t * text,
|
||||||
int text_size);
|
int text_size);
|
||||||
|
|
Loading…
Reference in a new issue