* string.h (strchr): Eliminate.
* syscalls.cc (rename): Work around inexplicable C++ warning.
This commit is contained in:
parent
4962a9453a
commit
9ea50a60e1
@ -1,3 +1,9 @@
|
|||||||
|
2008-05-21 Christopher Faylor <me+cygwin@cgf.cx>
|
||||||
|
|
||||||
|
* string.h (strchr): Eliminate.
|
||||||
|
|
||||||
|
* syscalls.cc (rename): Work around inexplicable C++ warning.
|
||||||
|
|
||||||
2008-05-21 Corinna Vinschen <corinna@vinschen.de>
|
2008-05-21 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* fhandler_disk_file.cc (get_ino_by_handle): Rename pfai to fai.
|
* fhandler_disk_file.cc (get_ino_by_handle): Rename pfai to fai.
|
||||||
|
@ -17,27 +17,6 @@ details. */
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef strchr
|
|
||||||
#define strchr cygwin_strchr
|
|
||||||
static inline __stdcall char *
|
|
||||||
strchr (const char *s, int c)
|
|
||||||
{
|
|
||||||
register char * res;
|
|
||||||
__asm__ __volatile__ ("\
|
|
||||||
movb %%al,%%ah\n\
|
|
||||||
1: movb (%1),%%al\n\
|
|
||||||
cmpb %%ah,%%al\n\
|
|
||||||
je 2f\n\
|
|
||||||
incl %1\n\
|
|
||||||
testb %%al,%%al\n\
|
|
||||||
jne 1b\n\
|
|
||||||
xorl %1,%1\n\
|
|
||||||
2: movl %1,%0\n\
|
|
||||||
":"=a" (res), "=r" (s)
|
|
||||||
:"0" (c), "1" (s));
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
#undef strechr
|
#undef strechr
|
||||||
#define strechr cygwin_strechr
|
#define strechr cygwin_strechr
|
||||||
static inline __stdcall char *
|
static inline __stdcall char *
|
||||||
|
@ -1505,7 +1505,7 @@ rename (const char *oldpath, const char *newpath)
|
|||||||
bool old_explicit_suffix = false, new_explicit_suffix = false;
|
bool old_explicit_suffix = false, new_explicit_suffix = false;
|
||||||
size_t olen, nlen;
|
size_t olen, nlen;
|
||||||
bool equal_path;
|
bool equal_path;
|
||||||
NTSTATUS status;
|
NTSTATUS status = 0;
|
||||||
HANDLE fh = NULL, nfh;
|
HANDLE fh = NULL, nfh;
|
||||||
HANDLE old_trans = NULL, trans = NULL;
|
HANDLE old_trans = NULL, trans = NULL;
|
||||||
OBJECT_ATTRIBUTES attr;
|
OBJECT_ATTRIBUTES attr;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user