merge.
This commit is contained in:
commit
41a4497ecf
1 changed files with 2 additions and 2 deletions
4
st.c
4
st.c
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
#if defined(__linux)
|
#if defined(__linux)
|
||||||
#include <pty.h>
|
#include <pty.h>
|
||||||
#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
|
||||||
#include <util.h>
|
#include <util.h>
|
||||||
#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
||||||
#include <libutil.h>
|
#include <libutil.h>
|
||||||
|
@ -405,7 +405,7 @@ bpress(XEvent *e) {
|
||||||
void
|
void
|
||||||
selcopy(void) {
|
selcopy(void) {
|
||||||
char *str, *ptr;
|
char *str, *ptr;
|
||||||
int ls, x, y, sz, sl;
|
int x, y, sz, sl, ls = 0;
|
||||||
|
|
||||||
if(sel.bx == -1)
|
if(sel.bx == -1)
|
||||||
str = NULL;
|
str = NULL;
|
||||||
|
|
Loading…
Reference in a new issue