From 180e48af9a6f6379d5ee65960214d446b5d55291 Mon Sep 17 00:00:00 2001 From: Edilbert <Edilbert.Kirk@gmx.de> Date: Fri, 17 Oct 2014 14:38:46 +0200 Subject: [PATCH] make code compatible to OSX 10.10 Yosemite --- configure.sh | 4 +++- most.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.sh b/configure.sh index 8a7d27a..927820d 100755 --- a/configure.sh +++ b/configure.sh @@ -68,7 +68,7 @@ fi #check for C compiler # put your favourite compiler in front if you have more than one -for MOST_CC in icc gxlc gcc suncc cc NO_CC +for MOST_CC in cc gxlc gcc suncc cc NO_CC do `hash 2>/dev/null $MOST_CC` if [ $? = 0 ] ; then break ; fi @@ -188,6 +188,8 @@ elif [ -e "/usr/X11/lib" ] ; then XLIB_PATH="/usr/X11/lib" elif [ -e "/usr/lib/X11" ] ; then XLIB_PATH="/usr/lib/X11" +elif [ -e "/opt/X11" ] ; then + XLIB_PATH="/opt/X11" fi if [ -n ${XLIB_PATH} ] ; then echo "Found Xlib (X11) at: $XLIB_PATH" diff --git a/most.c b/most.c index b70c07b..d3b5054 100644 --- a/most.c +++ b/most.c @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <X11/Xutil.h> #include <X11/Xatom.h> #include <X11/keysym.h> +#include <X11/XKBlib.h> #define INT int @@ -2853,7 +2854,7 @@ int PPPCompiled(void) strcpy(fn,"puma/run/"); strcat(fn,exec_ppp); - if (fp = fopen(fn,"r")) + if ((fp = fopen(fn,"r"))) { fclose(fp); return 1; -- GitLab