From: Jose Ruiz <ruiz@adacore.com>
Date: Tue, 31 Oct 2006 17:51:01 +0000 (+0100)
Subject: cal.c: Use the header sys/time.h for VxWorks 6.2 or greater when using RTPs.
X-Git-Tag: releases/gcc-4.3.0~8789
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff9625b0fa07810acdae6d36dbaca8f5afef9d05;p=thirdparty%2Fgcc.git

cal.c: Use the header sys/time.h for VxWorks 6.2 or greater when using RTPs.

2006-10-31  Jose Ruiz  <ruiz@adacore.com>

	* cal.c: Use the header sys/time.h for VxWorks 6.2 or greater when
	using RTPs.

	* mkdir.c: Use a different version of mkdir for VxWorks 6.2 or greater
	when using RTPs.

From-SVN: r118247
---

diff --git a/gcc/ada/cal.c b/gcc/ada/cal.c
index 7b38e429fcc6..0a552aa17acc 100644
--- a/gcc/ada/cal.c
+++ b/gcc/ada/cal.c
@@ -6,7 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *          Copyright (C) 1992-2005, Free Software Foundation, Inc.         *
+ *          Copyright (C) 1992-2006, Free Software Foundation, Inc.         *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -55,6 +55,10 @@ __gnat_duration_to_timeval (long sec, long usec, void *t)
 #if defined (__vxworks)
 #ifdef __RTP__
 #include <time.h>
+#include <version.h>
+#if (_WRS_VXWORKS_MINOR != 0)
+#include <sys/time.h>
+#endif
 #else
 #include <sys/times.h>
 #endif
diff --git a/gcc/ada/mkdir.c b/gcc/ada/mkdir.c
index 45f345468f3b..1aadf106ba1a 100644
--- a/gcc/ada/mkdir.c
+++ b/gcc/ada/mkdir.c
@@ -6,7 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *             Copyright (C) 2002-2003, Free Software Foundation, Inc.      *
+ *             Copyright (C) 2002-2006, Free Software Foundation, Inc.      *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -32,6 +32,7 @@
 
 #ifdef __vxworks
 #include "vxWorks.h"
+#include <version.h>
 #endif /* __vxworks */
 
 #ifdef IN_RTS
@@ -50,7 +51,8 @@
 int
 __gnat_mkdir (char *dir_name)
 {
-#if defined (_WIN32) || defined (__vxworks)
+#if defined (_WIN32) || (defined (__vxworks) \
+                         && !(defined (__RTP__) && (_WRS_VXWORKS_MINOR != 0)))
   return mkdir (dir_name);
 #else
   return mkdir (dir_name, S_IRWXU | S_IRWXG | S_IRWXO);