change file name linux.h linux.cpp to Timer.h Timer.cpp

MQTTSNGateway/src/MQTTSNGWClient.h

@@ -17,6 +17,7 @@
 #ifndef MQTTSNGWCLIENT_H_
 #define MQTTSNGWCLIENT_H_
 
+#include <Timer.h>    // Timer class
 #include "MQTTSNGWProcess.h"
 #include "MQTTGWPacket.h"
 #include "MQTTSNGWPacket.h"
@@ -24,7 +25,6 @@
 #include "Network.h"
 #include "SensorNetwork.h"
 #include "MQTTSNPacket.h"
-#include "linux.h"    // Timer class
 
 namespace MQTTSNGW
 {

MQTTSNGateway/src/MQTTSNGWPacketHandleTask.h

@@ -17,6 +17,7 @@
 #ifndef MQTTSNGWPACKETHANDLETASK_H_
 #define MQTTSNGWPACKETHANDLETASK_H_
 
+#include <Timer.h>
 #include "MQTTSNGWDefines.h"
 #include "MQTTSNGateway.h"
 #include "MQTTSNGWClient.h"
@@ -29,7 +30,6 @@
 #include "MQTTSNGWPublishHandler.h"
 #include "MQTTSNGWSubscribeHandler.h"
 #include "SensorNetwork.h"
-#include "linux.h"
 
 
 namespace MQTTSNGW

MQTTSNGateway/src/MQTTSNGWProcess.cpp

@@ -19,10 +19,10 @@
 #include <string.h>
 #include <stdarg.h>
 #include <signal.h>
+#include <Timer.h>
 #include <exception>
 #include "MQTTSNGWProcess.h"
 #include "Threading.h"
-#include "linux.h"
 
 using namespace std;
 using namespace MQTTSNGW;

MQTTSNGateway/src/linux/Timer.cpp

@@ -20,12 +20,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
-
+#include "Timer.h"
 #include "MQTTSNGWDefines.h"
-#include "linux.h"
 
 using namespace std;
-
 using namespace MQTTSNGW;
 
 /*=====================================

MQTTSNGateway/src/linux/Timer.h

@@ -13,9 +13,11 @@
  * Contributors:
  *    Tomoaki Yamaguchi - initial API and implementation 
  **************************************************************************************/
-#ifndef MQTTSNGATEWAY_SRC_LINUX_LINUX_H_
-#define MQTTSNGATEWAY_SRC_LINUX_LINUX_H_
+#ifndef MQTTSNGATEWAY_SRC_LINUX_TIMER_H_
+#define MQTTSNGATEWAY_SRC_LINUX_TIMER_H_
 
+#include "MQTTSNGWDefines.h"
+#include <time.h>
 namespace MQTTSNGW
 {
 /*==========================================================
@@ -67,4 +69,4 @@ private:
 
 }
 
-#endif /* MQTTSNGATEWAY_SRC_LINUX_LINUX_H_ */
+#endif /* MQTTSNGATEWAY_SRC_LINUX_TIMER_H_ */

Makefile

@@ -29,7 +29,7 @@ $(SRCDIR)/MQTTSNGWProcess.cpp \
 $(SRCDIR)/MQTTSNGWPublishHandler.cpp \
 $(SRCDIR)/MQTTSNGWSubscribeHandler.cpp \
 $(SRCDIR)/$(OS)/$(SENSORNET)/SensorNetwork.cpp \
-$(SRCDIR)/$(OS)/$(OS).cpp  \
+$(SRCDIR)/$(OS)/Timer.cpp  \
 $(SRCDIR)/$(OS)/Network.cpp \
 $(SRCDIR)/$(OS)/Threading.cpp