From 76b37f34d0df7fadbecf57ac52345c6b50631b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Lang=C3=B3?=
 <llango.u-szeged@partner.samsung.com>
Date: Fri, 19 Feb 2016 15:24:59 +0100
Subject: [PATCH] Build fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix build error on darwin and build with default libc.

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
---
 .../ecma/builtin-objects/ecma-builtin-date.c    |  4 +++-
 .../builtin-objects/ecma-builtin-helpers-date.c | 17 ++++++++++++++---
 jerry-libc/include/{ => sys}/time.h             | 11 +----------
 jerry-libc/target/darwin/jerry-libc-target.c    |  5 ++---
 jerry-libc/target/linux/jerry-libc-target.c     |  3 +--
 jerry-libc/target/mcu-stubs/jerry-libc-target.c |  2 +-
 6 files changed, 22 insertions(+), 20 deletions(-)
 rename jerry-libc/include/{ => sys}/time.h (84%)

diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c
index de488ec1a6..33a5fd59c8 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-date.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-date.c
@@ -33,6 +33,8 @@
 #define BUILTIN_UNDERSCORED_ID date
 #include "ecma-builtin-internal-routines-template.inc.h"
 
+#include <sys/time.h>
+
 /** \addtogroup ecma ECMA
  * @{
  *
@@ -449,7 +451,7 @@ ecma_builtin_date_utc (ecma_value_t this_arg __attr_unused___, /**< this argumen
 static ecma_value_t
 ecma_builtin_date_now (ecma_value_t this_arg __attr_unused___) /**< this argument */
 {
-  struct _timeval tv;
+  struct timeval tv;
   ecma_number_t *now_num_p = ecma_alloc_number ();
   *now_num_p = ECMA_NUMBER_ZERO;
 
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
index 2e876a8979..c29578ba81 100644
--- a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
+++ b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.c
@@ -26,7 +26,16 @@
 
 #ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_DATE_BUILTIN
 
-#include <time.h>
+#include <sys/time.h>
+
+/**
+ * Timezone structure
+ */
+struct timezone
+{
+  int tz_minuteswest;     /**< minutes west of Greenwich */
+  int tz_dsttime;         /**< type of DST correction */
+};
 
 /** \addtogroup ecma ECMA
  * @{
@@ -447,9 +456,10 @@ ecma_date_week_day (ecma_number_t time) /**< time value */
 ecma_number_t __attr_always_inline___
 ecma_date_local_tza ()
 {
+  struct timeval tv;
   struct timezone tz;
 
-  if (gettimeofday (NULL, &tz) != 0)
+  if (gettimeofday (&tv, &tz) != 0)
   {
     return ecma_raise_type_error ("gettimeofday failed");
   }
@@ -473,9 +483,10 @@ ecma_date_daylight_saving_ta (ecma_number_t time) /**< time value */
     return time; /* time is NaN */
   }
 
+  struct timeval tv;
   struct timezone tz;
 
-  if (gettimeofday (NULL, &tz) != 0)
+  if (gettimeofday (&tv, &tz) != 0)
   {
     return ecma_raise_type_error ("gettimeofday failed");
   }
diff --git a/jerry-libc/include/time.h b/jerry-libc/include/sys/time.h
similarity index 84%
rename from jerry-libc/include/time.h
rename to jerry-libc/include/sys/time.h
index cf67368f9c..e952e3e3ed 100644
--- a/jerry-libc/include/time.h
+++ b/jerry-libc/include/sys/time.h
@@ -25,21 +25,12 @@ extern "C"
 /**
  * Time value structure
  */
-struct _timeval
+struct timeval
 {
   unsigned long tv_sec;   /**< seconds */
   unsigned long tv_usec;  /**< microseconds */
 };
 
-/**
- * Timezone structure
- */
-struct timezone
-{
-  int tz_minuteswest;     /**< minutes west of Greenwich */
-  int tz_dsttime;         /**< type of DST correction */
-};
-
 int gettimeofday (void *tp, void *tzp);
 
 #ifdef __cplusplus
diff --git a/jerry-libc/target/darwin/jerry-libc-target.c b/jerry-libc/target/darwin/jerry-libc-target.c
index f8a66bcda3..e09f5a949c 100644
--- a/jerry-libc/target/darwin/jerry-libc-target.c
+++ b/jerry-libc/target/darwin/jerry-libc-target.c
@@ -25,10 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/syscall.h>
-#include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
+#include <sys/time.h>
 
 #include "jerry-libc-defs.h"
 
@@ -394,5 +393,5 @@ int
 gettimeofday (void *tp,  /**< struct timeval */
               void *tzp) /**< struct timezone */
 {
-  return (int) syscall_2 (__NR_gettimeofday, (long int) tp, (long int) tzp);
+  return (int) syscall_2 (gettimeofday, (long int) tp, (long int) tzp);
 } /* gettimeofday */
diff --git a/jerry-libc/target/linux/jerry-libc-target.c b/jerry-libc/target/linux/jerry-libc-target.c
index 442c47a63b..0821136c45 100644
--- a/jerry-libc/target/linux/jerry-libc-target.c
+++ b/jerry-libc/target/linux/jerry-libc-target.c
@@ -25,10 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syscall.h>
-#include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
+#include <sys/time.h>
 
 #include "jerry-libc-defs.h"
 
diff --git a/jerry-libc/target/mcu-stubs/jerry-libc-target.c b/jerry-libc/target/mcu-stubs/jerry-libc-target.c
index d1227ade95..aff291c1a3 100644
--- a/jerry-libc/target/mcu-stubs/jerry-libc-target.c
+++ b/jerry-libc/target/mcu-stubs/jerry-libc-target.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
+#include <sys/time.h>
 
 #include "jerry-libc-defs.h"