[Debian-iot-packaging] [openzwave-controlpanel] 16/81: Use Linix Makefile as default. Check for out of order node numbers.

[Dara Adib]

This is an automated email from the git hooks/post-receive script.

daradib-guest pushed a commit to branch debian/master
in repository openzwave-controlpanel.

commit ca4a1c615f79be64ec55a53760a9b7c4bed9fb1f
Author: glsatz at gmail.com <glsatz at gmail.com>
Date:   Tue Aug 16 21:05:28 2011 +0000

    Use Linix Makefile as default.
    Check for out of order node numbers.
---
 Makefile | 8 ++++----
 cp.js    | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1cd0b72..869920c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,13 +27,13 @@ INCLUDES := -I ../open-zwave/cpp/src -I ../open-zwave/cpp/src/command_classes/ \
 	-I ../libmicrohttpd/src/include
 # Remove comment below for gnutls support
 GNUTLS := #-lgnutls
-#LIBZWAVE := $(wildcard ../open-zwave/cpp/lib/linux/*.a)
-#LIBUSB := -ludev
+LIBZWAVE := $(wildcard ../open-zwave/cpp/lib/linux/*.a)
+LIBUSB := -ludev
 # Remove comment below for gnutls support
 GNUTLS := #-lgnutls
 # for Mac OS X comment out above 2 lines and uncomment next 2 lines
-LIBZWAVE := $(wildcard ../open-zwave/cpp/lib/mac/*.a)
-LIBUSB := -framework IOKit -framework CoreFoundation
+#LIBZWAVE := $(wildcard ../open-zwave/cpp/lib/mac/*.a)
+#LIBUSB := -framework IOKit -framework CoreFoundation
 LIBS := $(LIBZWAVE) $(GNUTLS) ../libmicrohttpd/src/daemon/.libs/libmicrohttpd.a -pthread $(LIBUSB)
 
 %.o : %.cpp
diff --git a/cp.js b/cp.js
index ed215ff..d8ef792 100644
--- a/cp.js
+++ b/cp.js
@@ -207,6 +207,8 @@ function PollReply()
       if (changed) {
 	var stuff = '';
 	for (var i = 1; i < nodes.length; i++) {
+	  if (nodes[i] == undefined)
+	    continue;
 	  var dt = new Date(nodes[i].time*1000);
 	  var yd = new Date(dt.getDate()-1);
 	  var ts;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave-controlpanel.git