From bddd31abf2deb843fee4325ebbf3bbdceec35287 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Wed, 9 Sep 2009 21:06:51 +0000
Subject: [PATCH] Fixed compiler warnings

---
 apps/shell/shell-rime-unicast.c | 3 +--
 apps/shell/shell-sensortweet.c  | 3 +--
 platform/native/clock.c         | 9 ++++-----
 platform/native/contiki-conf.h  | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/shell/shell-rime-unicast.c b/apps/shell/shell-rime-unicast.c
index 8486ac316..f5ef1ddf1 100644
--- a/apps/shell/shell-rime-unicast.c
+++ b/apps/shell/shell-rime-unicast.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime-unicast.c,v 1.1 2009/05/10 21:04:40 adamdunkels Exp $
+ * $Id: shell-rime-unicast.c,v 1.2 2009/09/09 21:06:51 adamdunkels Exp $
  */
 
 /**
@@ -87,7 +87,6 @@ PROCESS_THREAD(shell_unicast_send_process, ev, data)
   int len;
   const char *nextptr;
   struct unicast_msg *msg;
-  char buf[30];
   
   PROCESS_BEGIN();
   
diff --git a/apps/shell/shell-sensortweet.c b/apps/shell/shell-sensortweet.c
index 4d1584e97..edaba5053 100644
--- a/apps/shell/shell-sensortweet.c
+++ b/apps/shell/shell-sensortweet.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sensortweet.c,v 1.1 2009/05/11 17:11:37 adamdunkels Exp $
+ * $Id: shell-sensortweet.c,v 1.2 2009/09/09 21:06:51 adamdunkels Exp $
  */
 
 /**
@@ -61,7 +61,6 @@ PROCESS_THREAD(sensortweet_process, ev, data)
 {
   char message[140];
   char username_password[MAX_USERNAME_PASSWORD];
-  int len;
   int temp;
   uint16_t humidity;
   uint16_t battery_indicator;
diff --git a/platform/native/clock.c b/platform/native/clock.c
index 335d223a7..86e7bac6f 100644
--- a/platform/native/clock.c
+++ b/platform/native/clock.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: clock.c,v 1.2 2008/07/09 09:34:29 adamdunkels Exp $
+ * $Id: clock.c,v 1.3 2009/09/09 21:11:24 adamdunkels Exp $
  */
 
 /**
@@ -39,6 +39,7 @@
  */
 
 #include "sys/clock.h"
+#include <time.h>
 #include <sys/time.h>
 
 /*---------------------------------------------------------------------------*/
@@ -46,9 +47,8 @@ clock_time_t
 clock_time(void)
 {
   struct timeval tv;
-  struct timezone tz;
    
-  gettimeofday(&tv, &tz);
+  gettimeofday(&tv, NULL);
  
   return tv.tv_sec * 1000 + tv.tv_usec / 1000;
 }
@@ -57,9 +57,8 @@ unsigned long
 clock_seconds(void)
 {
   struct timeval tv;
-  struct timezone tz;
    
-  gettimeofday(&tv, &tz);
+  gettimeofday(&tv, NULL);
  
   return tv.tv_sec;
 }
diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h
index 7d9162f9f..5107872f7 100644
--- a/platform/native/contiki-conf.h
+++ b/platform/native/contiki-conf.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: contiki-conf.h,v 1.11 2008/10/15 09:14:25 adamdunkels Exp $
+ * @(#)$Id: contiki-conf.h,v 1.12 2009/09/09 21:11:24 adamdunkels Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -40,7 +40,7 @@
 #define CC_CONF_FUNCTION_POINTER_ARGS  1
 #define CC_CONF_FASTCALL
 #define CC_CONF_VA_ARGS                1
-#define CC_CONF_INLINE                 inline
+/*#define CC_CONF_INLINE                 inline*/
 
 #define CCIF
 #define CLIF