rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/PLATFORM_PATH_SEPARATOR/PLATFORM_DIR_SEPARATOR/

This commit is contained in:
suzuki toshiya 2011-01-06 18:28:37 +09:00
parent b440828b6c
commit dfaf70a056
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builds/unix/ftconfig.in
View File

@ -172,17 +172,17 @@ FT_BEGIN_HEADER
/* Pathname separator used by resource-fork accessor & ft_basename() */
/* */
#ifdef PLATFORM_PATH_SEPARATOR
#ifdef PLATFORM_DIR_SEPARATOR
/* explicitly defined, do nothing */
#elif defined( __DOS__ ) || defined( __OS2__ ) || defined( _WIN32 ) || \
defined( __SYMBIAN32__ )
#define PLATFORM_PATH_SEPARATOR "\\"
#define PLATFORM_DIR_SEPARATOR "\\"
#elif defined( FT_MACINTOSH ) && !defined( __MACH__ )
#define PLATFORM_PATH_SEPARATOR ":"
#define PLATFORM_DIR_SEPARATOR ":"
#elif defined( __riscos__ ) || defined( VMS )
#define PLATFORM_PATH_SEPARATOR "."
#define PLATFORM_DIR_SEPARATOR "."
#else
#define PLATFORM_PATH_SEPARATOR "/"
#define PLATFORM_DIR_SEPARATOR "/"
#endif

10
include/freetype/config/ftconfig.h
View File

@ -150,17 +150,17 @@ FT_BEGIN_HEADER
/* Pathname separator used by resource-fork accessor & ft_basename() */
/* */
#ifdef PLATFORM_PATH_SEPARATOR
#ifdef PLATFORM_DIR_SEPARATOR
/* explicitly defined, do nothing */
#elif defined( __DOS__ ) || defined( __OS2__ ) || defined( _WIN32 ) || \
defined( __SYMBIAN32__ )
#define PLATFORM_PATH_SEPARATOR "\\"
#define PLATFORM_DIR_SEPARATOR "\\"
#elif defined( FT_MACINTOSH ) && !defined( __MACH__ )
#define PLATFORM_PATH_SEPARATOR ":"
#define PLATFORM_DIR_SEPARATOR ":"
#elif defined( __riscos__ ) || defined( VMS )
#define PLATFORM_PATH_SEPARATOR "."
#define PLATFORM_DIR_SEPARATOR "."
#else
#define PLATFORM_PATH_SEPARATOR "/"
#define PLATFORM_DIR_SEPARATOR "/"
#endif

14
src/base/ftrfork.c
View File

@ -545,7 +545,7 @@
FT_MEM_COPY( newpath, base_file_name, base_file_len );
FT_MEM_COPY( newpath + base_file_len,
PLATFORM_PATH_SEPARATOR "rsrc", 6 );
PLATFORM_DIR_SEPARATOR "rsrc", 6 );
*result_file_name = newpath;
*result_offset = 0;
@ -582,8 +582,8 @@
FT_MEM_COPY( newpath, base_file_name, base_file_len );
FT_MEM_COPY( newpath + base_file_len,
PLATFORM_PATH_SEPARATOR "..namedfork"
PLATFORM_PATH_SEPARATOR "rsrc", 18 );
PLATFORM_DIR_SEPARATOR "..namedfork"
PLATFORM_DIR_SEPARATOR "rsrc", 18 );
*result_file_name = newpath;
*result_offset = 0;
@ -609,7 +609,7 @@
newpath = raccess_make_file_name( memory, base_file_name,
"resource.frk"
PLATFORM_PATH_SEPARATOR );
PLATFORM_DIR_SEPARATOR );
if ( !newpath )
return FT_Err_Out_Of_Memory;
@ -637,7 +637,7 @@
newpath = raccess_make_file_name( memory, base_file_name,
".resource"
PLATFORM_PATH_SEPARATOR );
PLATFORM_DIR_SEPARATOR );
if ( !newpath )
return FT_Err_Out_Of_Memory;
@ -697,7 +697,7 @@
newpath = raccess_make_file_name( memory, base_file_name,
".AppleDouble"
PLATFORM_PATH_SEPARATOR );
PLATFORM_DIR_SEPARATOR );
if ( !newpath )
return FT_Err_Out_Of_Memory;
@ -822,7 +822,7 @@
if ( FT_ALLOC( new_name, new_length + 1 ) )
return NULL;
tmp = ft_strrchr( original_name, PLATFORM_PATH_SEPARATOR[0] );
tmp = ft_strrchr( original_name, PLATFORM_DIR_SEPARATOR[0] );
if ( tmp )
{
ft_strncpy( new_name, original_name, tmp - original_name + 1 );