[hackers] [st] merge. || Aurélien Aptel

changeset: 171:c4ef5533a330
tag: tip
parent: 170:3b8fe89f8979
parent: 169:11071988f994
user: Aurélien Aptel <aurelien.aptel_AT_gmail.com>
date: Fri Nov 26 22:12:54 2010 +0100
files: st.c
description:
merge.

diff -r 3b8fe89f8979 -r c4ef5533a330 st.c
--- a/st.c Fri Nov 26 22:11:31 2010 +0100
+++ b/st.c Fri Nov 26 22:12:54 2010 +0100
@@ -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 @@
 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;
Received on Fri Nov 26 2010 - 21:13:07 CET