commit 3cf9c2736c8e47f2912280b89874f79009026752
from: Aurélien Aptel <aurelien.aptel@gmail.com>
date: Fri Nov 26 21:12:54 2010 UTC

merge.

commit - c1f5b697a80879ac465c2a498c3bf33f1058f377
commit + 3cf9c2736c8e47f2912280b89874f79009026752
blob - 8e3d72ff7228687a6555d2ec8ce46b7dfb53ede0
blob + e988696e604a401aa7cb0c2d47957c24154868ed
--- st.c
+++ 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;