circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-08 08:58:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix for version changes.

Browse Source
This commit is contained in:
Nicholas Marriott 2020-01-28 11:28:30 +00:00
parent ee3d3db364
commit 685eb381de
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -11,8 +11,9 @@ EXTRA_DIST = \
dist_EXTRA_tmux_SOURCES = compat/*.[ch] dist_EXTRA_tmux_SOURCES = compat/*.[ch]
# Preprocessor flags. # Preprocessor flags.
AM_CPPFLAGS += @XOPEN_DEFINES@ AM_CPPFLAGS += @XOPEN_DEFINES@ \
AM_CPPFLAGS += -DTMUX_CONF="\"$(sysconfdir)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\"" -DTMUX_VERSION="\"@VERSION@\"" \
-DTMUX_CONF="\"$(sysconfdir)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
# Additional object files. # Additional object files.
LDADD = $(LIBOBJS) LDADD = $(LIBOBJS)

1
input.c
View File

@ -20,6 +20,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <ctype.h>
#include <resolv.h> #include <resolv.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

13
tmux.c
View File

@ -213,15 +213,7 @@ find_home(void)
const char * const char *
getversion(void) getversion(void)
{ {
static char *version; return TMUX_VERSION;
struct utsname u;
if (version == NULL) {
if (uname(&u) < 0)
fatalx("uname failed");
xasprintf(&version, "openbsd-%s", u.release);
}
return version;
} }
int int
@ -264,9 +256,6 @@ main(int argc, char **argv)
else else
flags |= CLIENT_CONTROL; flags |= CLIENT_CONTROL;
break; break;
case 'V':
printf("%s %s\n", getprogname(), VERSION);
exit(0);
case 'f': case 'f':
set_cfg_file(optarg); set_cfg_file(optarg);
break; break;