Revision: 41093
http://brlcad.svn.sourceforge.net/brlcad/?rev=41093&view=rev
Author: brlcad
Date: 2010-10-19 05:41:34 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
more header cleanup for Windows checking for sys/time.h and others.
Modified Paths:
--------------
brlcad/trunk/src/adrt/isst_tcltk.c
brlcad/trunk/src/adrt/master/master.c
brlcad/trunk/src/adrt/slave/slave.c
brlcad/trunk/src/conv/step/schema.h
brlcad/trunk/src/fbed/empty.c
brlcad/trunk/src/librt/timer42.c
brlcad/trunk/src/librtserver/rtserverTest.c
brlcad/trunk/src/remrt/remrt.c
brlcad/trunk/src/remrt/rtsrv.c
brlcad/trunk/src/rt/heatgraph.c
brlcad/trunk/src/util/dunncomm.c
brlcad/trunk/src/util/ttcp.c
Modified: brlcad/trunk/src/adrt/isst_tcltk.c
===================================================================
--- brlcad/trunk/src/adrt/isst_tcltk.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/adrt/isst_tcltk.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -25,11 +25,11 @@
#include <stdio.h>
#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+# include <unistd.h>
#endif
#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+# include <sys/time.h>
#endif
#include "tcl.h"
Modified: brlcad/trunk/src/adrt/master/master.c
===================================================================
--- brlcad/trunk/src/adrt/master/master.c 2010-10-19 05:41:06 UTC (rev
41092)
+++ brlcad/trunk/src/adrt/master/master.c 2010-10-19 05:41:34 UTC (rev
41093)
@@ -27,8 +27,11 @@
#include <stdlib.h>
#include <signal.h>
#include <string.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
#include "bu.h"
#include "camera.h"
Modified: brlcad/trunk/src/adrt/slave/slave.c
===================================================================
--- brlcad/trunk/src/adrt/slave/slave.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/adrt/slave/slave.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -31,9 +31,11 @@
#include <stdlib.h>
#include <signal.h>
#include <string.h>
-#include <sys/time.h>
#include <pthread.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif
Modified: brlcad/trunk/src/conv/step/schema.h
===================================================================
--- brlcad/trunk/src/conv/step/schema.h 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/conv/step/schema.h 2010-10-19 05:41:34 UTC (rev 41093)
@@ -5,7 +5,9 @@
// regenerate it.
/* $Id$ */
#ifdef SCL_LOGGING
-#include <sys/time.h>
+# ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+# endif
#endif
#ifdef __OSTORE__
Modified: brlcad/trunk/src/fbed/empty.c
===================================================================
--- brlcad/trunk/src/fbed/empty.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/fbed/empty.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -23,8 +23,10 @@
#include "common.h"
-#include <stdio.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include "bio.h"
#include "fb.h"
Modified: brlcad/trunk/src/librt/timer42.c
===================================================================
--- brlcad/trunk/src/librt/timer42.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/librt/timer42.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -30,9 +30,13 @@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
-#include <sys/time.h>
#include <sys/resource.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+
+
#include "bu.h"
#include "vmath.h"
#include "raytrace.h"
Modified: brlcad/trunk/src/librtserver/rtserverTest.c
===================================================================
--- brlcad/trunk/src/librtserver/rtserverTest.c 2010-10-19 05:41:06 UTC (rev
41092)
+++ brlcad/trunk/src/librtserver/rtserverTest.c 2010-10-19 05:41:34 UTC (rev
41093)
@@ -38,7 +38,9 @@
#include "rtgeom.h"
#include "rtserver.h"
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#include <time.h>
/* number of seconds to wait for geometry to load */
Modified: brlcad/trunk/src/remrt/remrt.c
===================================================================
--- brlcad/trunk/src/remrt/remrt.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/remrt/remrt.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -43,7 +43,9 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <time.h>
-#include <sys/time.h> /* sometimes includes <time.h> */
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h> /* sometimes includes <time.h> */
+#endif
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
Modified: brlcad/trunk/src/remrt/rtsrv.c
===================================================================
--- brlcad/trunk/src/remrt/rtsrv.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/remrt/rtsrv.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -29,7 +29,7 @@
#include <string.h>
#include <stdarg.h>
#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+# include <sys/time.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
Modified: brlcad/trunk/src/rt/heatgraph.c
===================================================================
--- brlcad/trunk/src/rt/heatgraph.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/rt/heatgraph.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -28,21 +28,25 @@
#include "common.h"
#include <sys/types.h>
-#include <sys/time.h>
#include <sys/resource.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#include "bu.h"
#include "vmath.h"
#include "raytrace.h"
#include "fb.h"
#include "rtprivate.h"
-#include "./ext.h"
#include "plot3.h"
#include "scanline.h"
+#include "./ext.h"
+
+
static struct timeval timeStart; /* These are pulled directly from
timer42 */
static struct rusage ruA; /* Resource utilization at the start */
static struct rusage ruAc;
Modified: brlcad/trunk/src/util/dunncomm.c
===================================================================
--- brlcad/trunk/src/util/dunncomm.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/util/dunncomm.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -28,7 +28,9 @@
#include <stdlib.h>
#include <signal.h>
#include <string.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#ifdef __NetBSD__
# define USE_OLD_TTY
# include <sys/ioctl_compat.h>
Modified: brlcad/trunk/src/util/ttcp.c
===================================================================
--- brlcad/trunk/src/util/ttcp.c 2010-10-19 05:41:06 UTC (rev 41092)
+++ brlcad/trunk/src/util/ttcp.c 2010-10-19 05:41:34 UTC (rev 41093)
@@ -52,10 +52,13 @@
#endif
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <sys/time.h> /* struct timeval */
+#ifndef _WIN32
+# include <sys/time.h> /* struct timeval */
+# include <netdb.h>
+#else
+# include <windows.h>
+#endif
-#include <netdb.h>
-
#if defined(SYSV) || defined(__HAIKU__)
# include <sys/times.h>
# include <sys/param.h>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
