diff options
| author | Jan Dubois <jand@activestate.com> | 2005-11-07 12:39:02 -0800 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2005-11-08 06:29:56 +0000 |
| commit | 8c56068e9474ff1eb28abd58496550d54581dd25 (patch) | |
| tree | a3dde0abf1319e8cc5242b46d08d77903fa1f427 /wince | |
| parent | 209e7cf1ea9df7467abe46e5e3bcef1f4e8c5847 (diff) | |
| download | perl-8c56068e9474ff1eb28abd58496550d54581dd25.tar.gz | |
Remove unused USING_WIDE code from win32 and wince branches
From: "Jan Dubois" <jand@ActiveState.com>
Message-ID: <078001c5e41e$585c4140$6401a8c0@candy>
p4raw-id: //depot/perl@26041
Diffstat (limited to 'wince')
| -rw-r--r-- | wince/perlhost.h | 8 | ||||
| -rw-r--r-- | wince/win32.h | 16 | ||||
| -rw-r--r-- | wince/wince.c | 11 |
3 files changed, 3 insertions, 32 deletions
diff --git a/wince/perlhost.h b/wince/perlhost.h index bcf2b4f851..a15ff6d5fb 100644 --- a/wince/perlhost.h +++ b/wince/perlhost.h @@ -2424,13 +2424,7 @@ CPerlHost::Chdir(const char *dirname) errno = ENOENT; return -1; } - if (USING_WIDE()) { - WCHAR wBuffer[MAX_PATH]; - A2WHELPER(dirname, wBuffer, sizeof(wBuffer)); - ret = m_pvDir->SetCurrentDirectoryW(wBuffer); - } - else - ret = m_pvDir->SetCurrentDirectoryA((char*)dirname); + ret = m_pvDir->SetCurrentDirectoryA((char*)dirname); if(ret < 0) { errno = ENOENT; } diff --git a/wince/win32.h b/wince/win32.h index 3c38d5d0f2..6ff870ff1e 100644 --- a/wince/win32.h +++ b/wince/win32.h @@ -404,22 +404,6 @@ DllExport int win32_async_check(pTHX); #define w32_use_showwindow (PL_sys_intern.thr_intern.Wuse_showwindow) #define w32_showwindow (PL_sys_intern.thr_intern.Wshowwindow) -/* UNICODE<>ANSI translation helpers */ -/* Use CP_ACP when mode is ANSI */ -/* Use CP_UTF8 when mode is UTF8 */ - -#define A2WHELPER_LEN(lpa, alen, lpw, nBytes)\ - (lpw[0] = 0, MultiByteToWideChar((IN_BYTES) ? CP_ACP : CP_UTF8, 0, \ - lpa, alen, lpw, (nBytes/sizeof(WCHAR)))) -#define A2WHELPER(lpa, lpw, nBytes) A2WHELPER_LEN(lpa, -1, lpw, nBytes) - -#define W2AHELPER_LEN(lpw, wlen, lpa, nChars)\ - (lpa[0] = '\0', WideCharToMultiByte((IN_BYTES) ? CP_ACP : CP_UTF8, 0, \ - lpw, wlen, (LPSTR)lpa, nChars,NULL,NULL)) -#define W2AHELPER(lpw, lpa, nChars) W2AHELPER_LEN(lpw, -1, lpa, nChars) - -#define USING_WIDE() (0) - #ifdef USE_ITHREADS # define PERL_WAIT_FOR_CHILDREN \ STMT_START { \ diff --git a/wince/wince.c b/wince/wince.c index e498f077c1..dc92163f79 100644 --- a/wince/wince.c +++ b/wince/wince.c @@ -1937,15 +1937,8 @@ win32_get_childdir(void) { dTHX; char* ptr; - char szfilename[(MAX_PATH+1)*2]; - if (USING_WIDE()) { - WCHAR wfilename[MAX_PATH+1]; - GetCurrentDirectoryW(MAX_PATH+1, wfilename); - W2AHELPER(wfilename, szfilename, sizeof(szfilename)); - } - else { - GetCurrentDirectoryA(MAX_PATH+1, szfilename); - } + char szfilename[MAX_PATH+1]; + GetCurrentDirectoryA(MAX_PATH+1, szfilename); Newx(ptr, strlen(szfilename)+1, char); strcpy(ptr, szfilename); |