From: Aurélien Aptel <aurelien.aptel@gmail.com>
Date: Fri, 26 Nov 2010 21:12:54 +0000 (+0100)
Subject: merge.
X-Git-Url: https://git.xinqibao.xyz/st.git/commitdiff_plain/41a4497ecfa66c1dbc65202ae80542c18c5d7793?hp=00ba6969f863c75536910a0138b5161bbd0638c9

merge.
---

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;