Revision: 65543
http://sourceforge.net/p/brlcad/code/65543
Author: brlcad
Date: 2015-07-07 20:57:35 +0000 (Tue, 07 Jul 2015)
Log Message:
-----------
swap the search ordering so that the posix name is tested/found first before
looking for the underscored version. freebsd has both _pipe and pipe (it's a
weak alias, not different like on windows), so the #define is the wrong result.
probably a good idea to test all the _symbols in that order, but will have to
be tested on windows
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2015-07-07 18:12:01 UTC (rev 65542)
+++ brlcad/trunk/CMakeLists.txt 2015-07-07 20:57:35 UTC (rev 65543)
@@ -2362,13 +2362,15 @@
endif(HAVE__STRNICMP)
# pipe
-BRLCAD_FUNCTION_EXISTS(_pipe HAVE__PIPE)
-if(HAVE__PIPE)
- # Note, we can't just #define pipe _pipe because of the extra args
- CONFIG_H_APPEND(BRLCAD "#define pipe(_FD) (_pipe((_FD), 256, _O_TEXT))\n")
-else(HAVE__PIPE)
- BRLCAD_FUNCTION_EXISTS(pipe HAVE_PIPE)
-endif(HAVE__PIPE)
+BRLCAD_FUNCTION_EXISTS(pipe HAVE_PIPE)
+if(NOT HAVE_PIPE)
+ # freebsd has _pipe as an alias to pipe, so test second
+ BRLCAD_FUNCTION_EXISTS(_pipe HAVE__PIPE)
+ if(HAVE__PIPE)
+ # Note, we can't just #define pipe _pipe because of the extra args
+ CONFIG_H_APPEND(BRLCAD "#define pipe(_FD) (_pipe((_FD), 256, _O_TEXT))\n")
+ endif(HAVE__PIPE)
+endif(HAVE_PIPE)
# fork is a no-go on Windows...
BRLCAD_FUNCTION_EXISTS(fork HAVE_FORK)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
