Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

client: show build not OS platform in messages #2436

Merged
merged 1 commit into from
Apr 4, 2018
Merged

client: show build not OS platform in messages #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/client_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ int CLIENT_STATE::init() {
core_client_version.major,
core_client_version.minor,
core_client_version.release,
get_primary_platform(),
HOSTTYPE,
#ifdef _DEBUG
" (DEBUG)"
#else
Expand Down
6 changes: 0 additions & 6 deletions client/cs_cmdline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,7 @@ void CLIENT_STATE::parse_cmdline(int argc, char** argv) {
if (i == argc-1) show_options = true;
else safe_strcpy(update_prefs_url, argv[++i]);
} else if (ARG(version)) {
#ifdef __APPLE__
CLIENT_STATE cs;
cs.detect_platforms();
printf(BOINC_VERSION_STRING " %s\n", cs.get_primary_platform());
#else
printf(BOINC_VERSION_STRING " " HOSTTYPE "\n");
#endif
exit(0);
#ifdef __APPLE__
// workaround for bug in XCode 4.2: accept but ignore
Expand Down
2 changes: 1 addition & 1 deletion client/http_curl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static void get_user_agent_string() {
if (g_user_agent_string[0]) return;
snprintf(g_user_agent_string, sizeof(g_user_agent_string),
"BOINC client (%s %d.%d.%d)",
gstate.get_primary_platform(),
HOSTTYPE,
BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, BOINC_RELEASE
);
if (strlen(gstate.client_brand)) {
Expand Down
5 changes: 3 additions & 2 deletions clientgui/mac/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,9 @@
/* #undef HAVE__PROC_SELF_STAT */

/* Host for this compilation */
/* "i686-apple-darwin", "x86_64-apple-darwin" or "powerpc-apple-darwin" determined at run time */
#define HOSTTYPE ""
#ifdef __x86_64__
#define HOSTTYPE "x86_64-apple-darwin"
#endif

/* "Define to 1 if largefile support causes missing symbols in C++" */
/* #undef LARGEFILE_BREAKS_CXX */
Expand Down