diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-06 18:28:37 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-10 00:43:39 +0900 |
| commit | dfaf70a056063aae74c6197e1e55bb8bb577a36b (patch) | |
| tree | 4b947357ebee1027041d4c1478f76ecc319781c6 | |
| parent | b440828b6c74b663b3438248974d1cafcb4bdcc6 (diff) | |
| download | freetype2-dfaf70a056063aae74c6197e1e55bb8bb577a36b.tar.gz | |
s/PLATFORM_PATH_SEPARATOR/PLATFORM_DIR_SEPARATOR/
| -rw-r--r-- | builds/unix/ftconfig.in | 10 | ||||
| -rw-r--r-- | include/freetype/config/ftconfig.h | 10 | ||||
| -rw-r--r-- | src/base/ftrfork.c | 14 |
3 files changed, 17 insertions, 17 deletions
diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 85bde304a..680fc7f2d 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -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 diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index de7d654a2..cd0fa2768 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -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 diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c index 819aa01af..01be27723 100644 --- a/src/base/ftrfork.c +++ b/src/base/ftrfork.c @@ -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 ); |