aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurélien Aptel <aurelien.aptel@gmail.com>2010-11-26 22:12:54 +0100
committerAurélien Aptel <aurelien.aptel@gmail.com>2010-11-26 22:12:54 +0100
commit41a4497ecfa66c1dbc65202ae80542c18c5d7793 (patch)
tree75ea42e9d785a1f0f3382dcc5d7b1334fed5bf59
parent00ba6969f863c75536910a0138b5161bbd0638c9 (diff)
parenteaf38bf310a3c7850df2444fcdd77683ab8e4dc2 (diff)
downloadst-41a4497ecfa66c1dbc65202ae80542c18c5d7793.tar.gz
st-41a4497ecfa66c1dbc65202ae80542c18c5d7793.tar.bz2
merge.
-rw-r--r--st.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/st.c b/st.c
index 8e3d72f..e988696 100644
--- a/st.c
+++ b/st.c
@@ -23,7 +23,7 @@
#if defined(__linux)
#include <pty.h>
-#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#include <util.h>
#elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h>
@@ -405,7 +405,7 @@ bpress(XEvent *e) {
void
selcopy(void) {
char *str, *ptr;
- int ls, x, y, sz, sl;
+ int x, y, sz, sl, ls = 0;
if(sel.bx == -1)
str = NULL;