Date: Mon, 14 Feb 2000 15:49:13 +0100 (MET) From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> To: Alexandre Julliard <julliard@lrc.epfl.ch>, David Howells <David.Howells@nexor.co.uk> Cc: freebsd-emulation@freebsd.org Subject: Patch for Wine to compile on FreeBSD 3.3 Message-ID: <Pine.GSO.4.21.0002141545180.22256-100000@nunki.dbai.tuwien.ac.at>
next in thread | raw e-mail | index | archive | help
David, I am afraid your recent patch to dlls/crtdll/wcstring.c completely broke builds on FreeBSD 3.3 due to lots of "unknown variable" errors. Alexandre, please find attached a patch that brings FreeBSD 3.3 back to build land. Gerald Index: dlls/crtdll/wcstring.c =================================================================== RCS file: /home/wine/wine/dlls/crtdll/wcstring.c,v retrieving revision 1.3 diff -c -3 -p -r1.3 wcstring.c *** dlls/crtdll/wcstring.c 2000/02/13 15:04:24 1.3 --- dlls/crtdll/wcstring.c 2000/02/14 15:34:59 *************** int CRTDLL_iswalnum(unsigned short wc) *** 418,424 **** #undef iswalnum return iswalnum(wc); #else ! return isalnum( LOBYTE(ch) ); /* FIXME */ #endif } --- 418,424 ---- #undef iswalnum return iswalnum(wc); #else ! return isalnum( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswalpha(unsigned short wc) *** 431,437 **** #undef iswalpha return iswalpha(wc); #else ! return isalpha( LOBYTE(ch) ); /* FIXME */ #endif } --- 431,437 ---- #undef iswalpha return iswalpha(wc); #else ! return isalpha( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswcntrl(unsigned short wc) *** 444,450 **** #undef iswcntrl return iswcntrl(wc); #else ! return iscntrl( LOBYTE(ch) ); /* FIXME */ #endif } --- 444,450 ---- #undef iswcntrl return iswcntrl(wc); #else ! return iscntrl( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswctype(unsigned short wc, u *** 471,477 **** #undef iswctype return iswctype(wc,mask); #else ! FIXME(":(%ld,%p): iswctype() not supported\n",hand,x2); #endif } --- 471,478 ---- #undef iswctype return iswctype(wc,mask); #else ! FIXME(":iswctype() not supported\n"); ! return 0; #endif } *************** int CRTDLL_iswdigit(unsigned short wc) *** 484,490 **** #undef iswdigit return iswdigit(wc); #else ! return isdigit( LOBYTE(ch) ); /* FIXME */ #endif } --- 485,491 ---- #undef iswdigit return iswdigit(wc); #else ! return isdigit( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswgraph(unsigned short wc) *** 497,503 **** #undef iswgraph return iswgraph(wc); #else ! return isgraph( LOBYTE(ch) ); /* FIXME */ #endif } --- 498,504 ---- #undef iswgraph return iswgraph(wc); #else ! return isgraph( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswlower(unsigned short wc) *** 510,516 **** #undef iswlower return iswlower(wc); #else ! return islower( LOBYTE(ch) ); /* FIXME */ #endif } --- 511,517 ---- #undef iswlower return iswlower(wc); #else ! return islower( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswprint(unsigned short wc) *** 523,529 **** #undef iswprint return iswprint(wc); #else ! return isprint( LOBYTE(ch) ); /* FIXME */ #endif } --- 524,530 ---- #undef iswprint return iswprint(wc); #else ! return isprint( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswpunct(unsigned short wc) *** 536,542 **** #undef iswpunct return iswpunct(wc); #else ! return ispunct( LOBYTE(ch) ); /* FIXME */ #endif } --- 537,543 ---- #undef iswpunct return iswpunct(wc); #else ! return ispunct( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswspace(unsigned short wc) *** 549,555 **** #undef iswspace return iswspace(wc); #else ! return isspace( LOBYTE(ch) ); /* FIXME */ #endif } --- 550,556 ---- #undef iswspace return iswspace(wc); #else ! return isspace( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswupper(unsigned short wc) *** 562,568 **** #undef iswupper return iswupper(wc); #else ! return isupper( LOBYTE(ch) ); /* FIXME */ #endif } --- 563,569 ---- #undef iswupper return iswupper(wc); #else ! return isupper( LOBYTE(wc) ); /* FIXME */ #endif } *************** int CRTDLL_iswxdigit(unsigned short wc) *** 575,580 **** #undef iswxdigit return iswxdigit(wc); #else ! return isxdigit( LOBYTE(ch) ); /* FIXME */ #endif } --- 576,581 ---- #undef iswxdigit return iswxdigit(wc); #else ! return isxdigit( LOBYTE(wc) ); /* FIXME */ #endif } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-emulation" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.GSO.4.21.0002141545180.22256-100000>