Mercurial > mbsePi-apps / file diff

--- a/thermferm/server.c	Thu Jun 19 15:49:29 2014 +0200
+++ b/thermferm/server.c	Fri Jun 20 17:42:36 2014 +0200
@@ -22,12 +22,13 @@
 
 #include "thermferm.h"
 
-#ifdef HAVE_WIRINGPI_H
 
 extern bool		my_shutdown;
 extern bool		debug;
+#ifdef HAVE_WIRINGPI_H
 extern int		lcdHandle;
 extern unsigned char	lcdbuf[MAX_LCDS][20][4];
+#endif
 extern sys_config       Config;
 
 int			s;		/* connected socket			*/
@@ -150,12 +151,14 @@
 		srv_send((char *)"ack");
 	    } else if (strncmp(buf, "lcd", 3) == 0) {
 		sprintf(obuf, "[\"                    \", \"                    \", \"                    \", \"                    \"]");
+#ifdef HAVE_WIRINGPI_H
 		for (i = 0; i < 20; i++) {
 		    obuf[i+2]  = lcdbuf[lcdHandle][i][0];
 		    obuf[i+26] = lcdbuf[lcdHandle][i][1];
 		    obuf[i+50] = lcdbuf[lcdHandle][i][2];
 		    obuf[i+74] = lcdbuf[lcdHandle][i][3];
 		}
+#endif
 		srv_send(obuf);
 	    } else if (strncmp(buf, "getMode", 7) == 0) {
 		srv_send("%c", Config.cs_mode);
@@ -285,8 +288,11 @@
 }
 
 
-
+#ifdef HAVE_WIRINGPI_H
 PI_THREAD (my_server_loop)
+#else
+int my_server_loop(void)
+#endif
 {
     socklen_t   addrlen;
     int         optval = 1;
@@ -317,19 +323,19 @@
     if (setsockopt(ls, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) == -1) {
 	syslog(LOG_NOTICE, "Can't setsockopt SO_REUSEADDR socket: %s", strerror(errno));
 	close(ls);
-	return NULL;
+	return 0;
     }
 
     if (bind(ls, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in)) == -1) {
 	syslog(LOG_NOTICE, "Can't bind to listen socket: %s", strerror(errno));
 	close(ls);
-	return NULL;
+	return 0;
     }
 
     if (listen(ls, 5) == -1) {
 	syslog(LOG_NOTICE, "Can't listen on listen socket: %s", strerror(errno));
 	close(ls);
-	return NULL;
+	return 0;
     }
 
     syslog(LOG_NOTICE, "listen socket created %d", ls);
@@ -370,5 +376,3 @@
 }
 
 
-#endif
-