Revision: 40983
http://brlcad.svn.sourceforge.net/brlcad/?rev=40983&view=rev
Author: starseeker
Date: 2010-10-13 21:19:45 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
Tcl shouldn't be pulling in common.h, and since common.h does work with our
current Windows build it ought to work with CMake's Windows build... - put
things in the correct state source code wise, need to try and possibly
re-examine build logic.
Modified Paths:
--------------
brlcad/branches/cmake/include/common.h
brlcad/branches/cmake/src/other/tcl/generic/tclInt.h
Modified: brlcad/branches/cmake/include/common.h
===================================================================
--- brlcad/branches/cmake/include/common.h 2010-10-13 20:37:26 UTC (rev
40982)
+++ brlcad/branches/cmake/include/common.h 2010-10-13 21:19:45 UTC (rev
40983)
@@ -112,16 +112,12 @@
* optional uintptr_t type.
*/
#if !defined(INT8_MAX) || !defined(INT16_MAX) || !defined(INT32_MAX) ||
!defined(INT64_MAX)
-# if defined(_WIN32) && !defined(__CYGWIN__)
-# include "pstdint.h"
+# if defined(__STDC__) || defined(__STRICT_ANSI__) || defined(__SIZE_TYPE__)
|| defined(HAVE_STDINT_H)
+# define __STDC_LIMIT_MACROS 1
+# define __STDC_CONSTANT_MACROS 1
+# include <stdint.h>
# else
-# if defined(__STDC__) || defined(__STRICT_ANSI__) ||
defined(__SIZE_TYPE__) || defined(HAVE_STDINT_H)
-# define __STDC_LIMIT_MACROS 1
-# define __STDC_CONSTANT_MACROS 1
-# include <stdint.h>
-# else
-# include "pstdint.h"
-# endif
+# include "pstdint.h"
# endif
#endif
Modified: brlcad/branches/cmake/src/other/tcl/generic/tclInt.h
===================================================================
--- brlcad/branches/cmake/src/other/tcl/generic/tclInt.h 2010-10-13
20:37:26 UTC (rev 40982)
+++ brlcad/branches/cmake/src/other/tcl/generic/tclInt.h 2010-10-13
21:19:45 UTC (rev 40983)
@@ -3948,8 +3948,6 @@
#include "tclIntPlatDecls.h"
#include "tclTomMathDecls.h"
-#include "../../../../include/common.h"
-
#endif /* _TCLINT */
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
