merge.

14 years ago · 41a4497ecf
parent 00ba6969f8 eaf38bf310
commit 41a4497ecf
1 changed files with 2 additions and 2 deletions
--- 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;