Revision: 41103
http://brlcad.svn.sourceforge.net/brlcad/?rev=41103&view=rev
Author: brlcad
Date: 2010-10-19 06:22:31 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
and yet even more Windows header inclusion protections.
Modified Paths:
--------------
brlcad/trunk/src/adrt/master/dispatcher.c
brlcad/trunk/src/adrt/master/tienet_master.c
Modified: brlcad/trunk/src/adrt/master/dispatcher.c
===================================================================
--- brlcad/trunk/src/adrt/master/dispatcher.c 2010-10-19 06:18:43 UTC (rev
41102)
+++ brlcad/trunk/src/adrt/master/dispatcher.c 2010-10-19 06:22:31 UTC (rev
41103)
@@ -21,10 +21,14 @@
*
*/
-#include <stdio.h>
+#include "common.h"
+
#include <stdlib.h>
#include <string.h>
-#include <pthread.h>
+#ifdef HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
+#include "bio.h"
#include "libtie/tie.h"
#include "adrt.h"
@@ -34,10 +38,12 @@
#include "camera.h"
#ifdef HAVE_SYS_SYSINFO_H
-#include <sys/sysinfo.h>
+# include <sys/sysinfo.h>
#elif defined(HAVE_SYS_SYSCTL_H)
-#include <sys/types.h>
-#include <sys/sysctl.h>
+# ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+# endif
+# include <sys/sysctl.h>
#endif
uint16_t dispatcher_frame;
Modified: brlcad/trunk/src/adrt/master/tienet_master.c
===================================================================
--- brlcad/trunk/src/adrt/master/tienet_master.c 2010-10-19 06:18:43 UTC
(rev 41102)
+++ brlcad/trunk/src/adrt/master/tienet_master.c 2010-10-19 06:22:31 UTC
(rev 41103)
@@ -24,18 +24,29 @@
*
*/
-#include <stdio.h>
+#include "common.h"
+
#include <stdlib.h>
#include <string.h>
-#include <pthread.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#ifdef HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
-#include <inttypes.h>
-
#include "libtie/tie.h"
#include "adrt.h"
#include "tienet.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
