From 0f7eb589da1ecc9ad51aa5647853014829b0ffcc Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 25 Nov 2007 18:07:19 +0000
Subject: [PATCH] Full merge from trunk at revision 41356 of entire boost-root
 tree.

[SVN r41369]
---
 include/boost/pending/integer_log2.hpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/boost/pending/integer_log2.hpp b/include/boost/pending/integer_log2.hpp
index fd8e446..15fd8b5 100644
--- a/include/boost/pending/integer_log2.hpp
+++ b/include/boost/pending/integer_log2.hpp
@@ -12,14 +12,17 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 // ------------------------------------------------------
-
+//
+// $Id$
 
 
 #ifndef BOOST_INTEGER_LOG2_HPP_GP_20030301
 #define BOOST_INTEGER_LOG2_HPP_GP_20030301
 
-#include <cassert>
-#include <climits> // actually used for Borland only
+#include <assert.h>
+#ifdef __BORLANDC__
+#include <climits>
+#endif
 #include "boost/limits.hpp"
 #include "boost/config.hpp"