Sat, 31 May 2014 11:47:23 +0200
Fixed compilation without wiringpi
rc433/Makefile | file | annotate | diff | comparison | revisions | |
rc433/rc433.h | file | annotate | diff | comparison | revisions | |
rc433/send.c | file | annotate | diff | comparison | revisions | |
rc433/send.h | file | annotate | diff | comparison | revisions | |
rc433/sniffer.c | file | annotate | diff | comparison | revisions | |
rc433/sniffer.h | file | annotate | diff | comparison | revisions | |
thermferm/Makefile | file | annotate | diff | comparison | revisions | |
thermferm/rdconfig.c | file | annotate | diff | comparison | revisions | |
thermferm/server.c | file | annotate | diff | comparison | revisions |
--- a/rc433/Makefile Sat May 31 11:39:13 2014 +0200 +++ b/rc433/Makefile Sat May 31 11:47:23 2014 +0200 @@ -60,8 +60,8 @@ # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT # Dependencies generated by make depend recv.o: rc433.h -send.o: rc433.h sniffer.o: rc433.h rc-switch.o: rc433.h xutil.o: rc433.h +send.o: rc433.h # End of generated dependencies
--- a/rc433/rc433.h Sat May 31 11:39:13 2014 +0200 +++ b/rc433/rc433.h Sat May 31 11:47:23 2014 +0200 @@ -15,6 +15,7 @@ #include <sys/types.h> #include <stdbool.h> +#ifdef HAVE_WIRINGPI_H /* wiringPi */ #include <wiringPi.h> @@ -50,5 +51,7 @@ char *xstrcpy(char *); char *xstrcat(char *, char *); +#endif + #endif
--- a/rc433/send.c Sat May 31 11:39:13 2014 +0200 +++ b/rc433/send.c Sat May 31 11:47:23 2014 +0200 @@ -20,8 +20,7 @@ * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *****************************************************************************/ -#include "../lib/mbselib.h" -#include "send.h" +#include "rc433.h" #ifdef HAVE_WIRINGPI_H
--- a/rc433/send.h Sat May 31 11:39:13 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -#ifndef _SEND_H -#define _SEND_H - - -#define TRUE 1 -#define FALSE 0 - - -#endif
--- a/rc433/sniffer.c Sat May 31 11:39:13 2014 +0200 +++ b/rc433/sniffer.c Sat May 31 11:47:23 2014 +0200 @@ -20,8 +20,7 @@ * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *****************************************************************************/ -#include "../lib/mbselib.h" -#include "sniffer.h" +#include "rc433.h" #ifdef HAVE_WIRINGPI_H
--- a/rc433/sniffer.h Sat May 31 11:39:13 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -#ifndef _SNIFFER_H -#define _SNIFFER_H - - -#define TRUE 1 -#define FALSE 0 - - -#endif
--- a/thermferm/Makefile Sat May 31 11:39:13 2014 +0200 +++ b/thermferm/Makefile Sat May 31 11:47:23 2014 +0200 @@ -54,13 +54,13 @@ # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT # Dependencies generated by make depend -thermferm.o: thermferm.h +rc-switch.o: thermferm.h sensors.o: thermferm.h -server.o: thermferm.h -xutil.o: thermferm.h -lcd-pcf8574.o: thermferm.h -rdconfig.o: thermferm.h lock.o: thermferm.h logger.o: thermferm.h -rc-switch.o: thermferm.h +lcd-pcf8574.o: thermferm.h +thermferm.o: thermferm.h +xutil.o: thermferm.h +server.o: thermferm.h +rdconfig.o: thermferm.h # End of generated dependencies
--- a/thermferm/rdconfig.c Sat May 31 11:39:13 2014 +0200 +++ b/thermferm/rdconfig.c Sat May 31 11:47:23 2014 +0200 @@ -22,6 +22,7 @@ #include "thermferm.h" +#ifdef HAVE_WIRINGPI_H bool debug = FALSE; static char *mypath; @@ -34,9 +35,7 @@ static int getstr(char **); static int getint(char **); static int getw1(char **); -#ifdef HAVE_WIRINGPI_H static int getrcs(char **); -#endif static int getuch(char **); static int getfloat(char **); //static int getbyt(char **); @@ -363,7 +362,6 @@ -#ifdef HAVE_WIRINGPI_H static int getrcs(char **dest) { char *p, *q = NULL, *r = NULL; @@ -401,7 +399,6 @@ return 0; } -#endif @@ -470,4 +467,5 @@ } */ +#endif