From 5cff456400f3228b53e2a9a072038a2105a86a79 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 1 May 2012 19:20:46 -0400 Subject: [PATCH] Define PROG, for newer versions of skalibs Needed to build from our source tarball on some Gentoo systems. Closes #239. Closes #254. --- src/examples/benchmark.cc | 5 +++++ src/examples/termemu.cc | 5 +++++ src/frontend/mosh-client.cc | 5 +++++ src/frontend/mosh-server.cc | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/src/examples/benchmark.cc b/src/examples/benchmark.cc index 5dae9f2..d3f5748 100644 --- a/src/examples/benchmark.cc +++ b/src/examples/benchmark.cc @@ -46,6 +46,11 @@ #include "locale_utils.h" #include "fatal_assert.h" +/* For newer skalibs */ +extern "C" { + const char *PROG = "benchmark"; +} + const int ITERATIONS = 100000; using namespace Terminal; diff --git a/src/examples/termemu.cc b/src/examples/termemu.cc index 9c9f63b..8d3296c 100644 --- a/src/examples/termemu.cc +++ b/src/examples/termemu.cc @@ -52,6 +52,11 @@ #include "locale_utils.h" #include "sigfd.h" +/* For newer skalibs */ +extern "C" { + const char *PROG = "termemu"; +} + const size_t buf_size = 16384; void emulate_terminal( int fd ); diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc index fa5114b..4d4fe7c 100644 --- a/src/frontend/mosh-client.cc +++ b/src/frontend/mosh-client.cc @@ -30,6 +30,11 @@ #include #include +/* For newer skalibs */ +extern "C" { + const char *PROG = "mosh-client"; +} + void usage( const char *argv0 ) { fprintf( stderr, "mosh-client (%s)\n", PACKAGE_STRING ); fprintf( stderr, "Copyright 2012 Keith Winstein \n" ); diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc index 6e35eb8..3b594b3 100644 --- a/src/frontend/mosh-server.cc +++ b/src/frontend/mosh-server.cc @@ -68,6 +68,11 @@ #include "networktransport.cc" +/* For newer skalibs */ +extern "C" { + const char *PROG = "mosh-server"; +} + typedef Network::Transport< Terminal::Complete, Network::UserStream > ServerConnection; void serve( int host_fd,