summaryrefslogtreecommitdiff
path: root/win32/win32.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-09 10:10:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-09 10:10:11 +0000
commitb136c5cd48062322fa25e696827dd1133b861373 (patch)
tree80eaa66c70b559359e1c39579c584933bfb7bb7d /win32/win32.c
parentfdb4c75a6549a976a2f05412ad15e7a7aa404e51 (diff)
win32/file.c: share functions with win32.c
* win32/file.c (rb_file_expand_path_internal, rb_file_load_ok): use functions defined in win32/win32.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-rw-r--r--win32/win32.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/win32/win32.c b/win32/win32.c
index ef1d7a9..1f0f13e 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1195,7 +1195,8 @@ is_batch(const char *cmd)
return 0;
}
-static UINT filecp(void);
+UINT rb_w32_filecp(void);
+#define filecp rb_w32_filecp
#define mbstr_to_wstr rb_w32_mbstr_to_wstr
#define wstr_to_mbstr rb_w32_wstr_to_mbstr
#define acp_to_wstr(str, plen) mbstr_to_wstr(CP_ACP, str, -1, plen)
@@ -1943,7 +1944,7 @@ opendir_internal(WCHAR *wpath, const char *filename)
}
/* License: Ruby's */
-static inline UINT
+UINT
filecp(void)
{
UINT cp = AreFileApisANSI() ? CP_ACP : CP_OEMCP;