The R Project SVN R

Rev

Rev 52150 | Rev 52666 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 52150 Rev 52152
Line 639... Line 639...
639 
		osvi.szCSDVersion);
 639 
		osvi.szCSDVersion);
640 
    SET_STRING_ELT(ans, 2, mkChar(ver));
 640 
    SET_STRING_ELT(ans, 2, mkChar(ver));
641 
    GetComputerNameW(name, &namelen);
 641 
    GetComputerNameW(name, &namelen);
642 
    wcstoutf8(buf, name, 1000);
 642 
    wcstoutf8(buf, name, 1000);
643 
    SET_STRING_ELT(ans, 3, mkCharCE(buf, CE_UTF8));
 643 
    SET_STRING_ELT(ans, 3, mkCharCE(buf, CE_UTF8));
- 
 
 644 
#ifdef WIN64
- 
 
 645 
    SET_STRING_ELT(ans, 4, mkChar("x86-64"));
- 
 
 646 
#else
644 
    SET_STRING_ELT(ans, 4, mkChar("x86"));
 647 
    SET_STRING_ELT(ans, 4, mkChar("x86"));
- 
 
 648 
#endif
645 
    GetUserNameW(user, &userlen);
 649 
    GetUserNameW(user, &userlen);
646 
    wcstoutf8(buf, user, 1000);
 650 
    wcstoutf8(buf, user, 1000);
647 
    SET_STRING_ELT(ans, 5, mkCharCE(buf, CE_UTF8));
 651 
    SET_STRING_ELT(ans, 5, mkCharCE(buf, CE_UTF8));
648 
    SET_STRING_ELT(ans, 6, STRING_ELT(ans, 5));
 652 
    SET_STRING_ELT(ans, 6, STRING_ELT(ans, 5));
649 
    PROTECT(ansnames = allocVector(STRSXP, 7));
 653 
    PROTECT(ansnames = allocVector(STRSXP, 7));