Revision: 41170
http://brlcad.svn.sourceforge.net/brlcad/?rev=41170&view=rev
Author: starseeker
Date: 2010-10-29 14:06:50 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Tcl warns that some compilers need #include lines in the leftmost column.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/CMake/CheckSystemFunctionality.cmake
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified:
brlcad/branches/cmake/src/other/tcl/CMake/CheckSystemFunctionality.cmake
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMake/CheckSystemFunctionality.cmake
2010-10-29 14:01:33 UTC (rev 41169)
+++ brlcad/branches/cmake/src/other/tcl/CMake/CheckSystemFunctionality.cmake
2010-10-29 14:06:50 UTC (rev 41170)
@@ -244,83 +244,83 @@
MACRO(TERMIOS_TERMIO_SGTTY)
SET(TERMIOS_SRC_1 "
- #include <termios.h>
- int main() {
- struct termios t;
- if (tcgetattr(0, &t) == 0) {
- cfsetospeed(&t, 0);
- t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
- return 0;
- }
- return 1;
- }
+#include <termios.h>
+int main() {
+struct termios t;
+if (tcgetattr(0, &t) == 0) {
+ cfsetospeed(&t, 0);
+ t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
+ return 0;
+}
+ return 1;
+}
")
SET(TERMIOS_SRC_2 "
- #include <termios.h>
- #include <errno.h>
+#include <termios.h>
+#include <errno.h>
- int main() {
- struct termios t;
- if (tcgetattr(0, &t) == 0
- || errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
- cfsetospeed(&t, 0);
- t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
- return 0;
- }
- return 1;
- }
+int main() {
+struct termios t;
+if (tcgetattr(0, &t) == 0
+ || errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+ cfsetospeed(&t, 0);
+ t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
+ return 0;
+ }
+ return 1;
+}
")
SET(TERMIO_SRC_1 "
- #include <termio.h>
- int main() {
- struct termio t;
- if (ioctl(0, TCGETA, &t) == 0) {
- t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
- return 0;
- }
- return 1;
- }
+#include <termio.h>
+int main() {
+struct termio t;
+if (ioctl(0, TCGETA, &t) == 0) {
+ t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
+ return 0;
+}
+ return 1;
+}
")
SET(TERMIO_SRC_2 "
- #include <termio.h>
- #include <errno.h>
+#include <termio.h>
+#include <errno.h>
- int main() {
- struct termio t;
- if (ioctl(0, TCGETA, &t) == 0
- || errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
- t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
- return 0;
- }
- return 1;
- }
+int main() {
+struct termio t;
+if (ioctl(0, TCGETA, &t) == 0
+ || errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+ t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
+ return 0;
+ }
+ return 1;
+}
")
SET(SGTTY_SRC_1 "
- #include <sgtty.h>
- int main() {
- struct sgttyb t;
- if (ioctl(0, TIOCGETP, &t) == 0) {
- t.sg_ospeed = 0;
- t.sg_flags |= ODDP | EVENP | RAW;
- return 0;
- }
- return 1;
- }
- ")
+#include <sgtty.h>
+int main() {
+struct sgttyb t;
+if (ioctl(0, TIOCGETP, &t) == 0) {
+ t.sg_ospeed = 0;
+ t.sg_flags |= ODDP | EVENP | RAW;
+ return 0;
+}
+ return 1;
+}
+ ")
SET(SGTTY_SRC_2 "
- #include <sgtty.h>
- #include <errno.h>
+#include <sgtty.h>
+#include <errno.h>
- int main() {
- struct sgttyb t;
- if (ioctl(0, TIOCGETP, &t) == 0
- || errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
- t.sg_ospeed = 0;
- t.sg_flags |= ODDP | EVENP | RAW;
- return 0;
- }
- return 1;
- }
+int main() {
+struct sgttyb t;
+if (ioctl(0, TIOCGETP, &t) == 0
+ || errno == ENOTTY || errno == ENXIO || errno == EINVAL) {
+ t.sg_ospeed = 0;
+ t.sg_flags |= ODDP | EVENP | RAW;
+ return 0;
+ }
+ return 1;
+}
")
CHECK_C_SOURCE_RUNS("${TERMIOS_SRC_1}" HAVE_TERMIOS)
IF(NOT HAVE_TERMIOS)
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-29 14:01:33 UTC
(rev 41169)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-29 14:06:50 UTC
(rev 41170)
@@ -597,6 +597,9 @@
ENDIF(TCL_THREADS)
+# Determine which interface to use to talk to the serial port.
+TERMIOS_TERMIO_SGTTY()
+
CHECK_INCLUDE_FILE_D(sys/types.h HAVE_SYS_TYPES_H)
CHECK_INCLUDE_FILE_D(sys/stat.h HAVE_SYS_STAT_H)
CHECK_INCLUDE_FILE_D(sys/fstatfs.h HAVE_SYS_FSTATFS_H)
@@ -621,7 +624,6 @@
CHECK_INCLUDE_FILE_USABILITY_D(sys/modem.h SYS_MODEM_H)
-TERMIOS_TERMIO_SGTTY()
CHECK_FD_SET_IN_TYPES_D()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
