Update of /cvsroot/boost/boost/libs/graph/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16636/libs/graph/src

Modified Files:
      Tag: RC_1_34_0
        graphviz_digraph_lex.cpp graphviz_graph_lex.cpp 
Log Message:
Patches from Trac #583.

Index: graphviz_digraph_lex.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/graph/src/Attic/graphviz_digraph_lex.cpp,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -d -r1.12.4.1 -r1.12.4.2
--- graphviz_digraph_lex.cpp    3 Nov 2006 19:17:54 -0000       1.12.4.1
+++ graphviz_digraph_lex.cpp    1 Jun 2007 16:12:08 -0000       1.12.4.2
@@ -1411,9 +1411,12 @@
 
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
+/* Avoid conflicts if isatty() has a different prototype in <unistd.h>. */
+#if !defined(__IBMCPP__)
 extern int isatty YY_PROTO(( int ));
 #endif
 #endif
+#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )

Index: graphviz_graph_lex.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/graph/src/Attic/graphviz_graph_lex.cpp,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -u -d -r1.12.4.1 -r1.12.4.2
--- graphviz_graph_lex.cpp      3 Nov 2006 19:17:56 -0000       1.12.4.1
+++ graphviz_graph_lex.cpp      1 Jun 2007 16:12:08 -0000       1.12.4.2
@@ -1411,9 +1411,12 @@
 
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
+/* Avoid conflicts if isatty() has a different prototype in <unistd.h>. */
+#if !defined(__IBMCPP__)
 extern int isatty YY_PROTO(( int ));
 #endif
 #endif
+#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to