Index: source/ariba/utility/internal/CMakeLists.txt
===================================================================
--- source/ariba/utility/internal/CMakeLists.txt	(revision 12775)
+++ 	(revision )
@@ -1,39 +1,0 @@
-# [License]
-# The Ariba-Underlay Copyright
-#
-# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH)
-#
-# Institute of Telematics
-# UniversitÀt Karlsruhe (TH)
-# Zirkel 2, 76128 Karlsruhe
-# Germany
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and documentation
-# are those of the authors and should not be interpreted as representing
-# official policies, either expressed or implied, of the Institute of
-# Telematics.
-# [License]
-
-add_headers(Utilities.hpp)
Index: source/ariba/utility/internal/Utilities.hpp
===================================================================
--- source/ariba/utility/internal/Utilities.hpp	(revision 12775)
+++ source/ariba/utility/internal/Utilities.hpp	(revision 2378)
@@ -1,3 +1,3 @@
-// [License]
+// [Licence]
 // The Ariba-Underlay Copyright
 //
@@ -35,10 +35,9 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [License]
+// [Licence]
 
 #ifndef UTILITIES_HPP_
 #define UTILITIES_HPP_
 
-#include "ariba/config.h"
 #include <boost/cstdint.hpp>
 #include <boost/type_traits.hpp>
@@ -47,9 +46,5 @@
 /* force inline macro */
 #ifndef finline
-	#ifdef HAVE_MAEMO
-		#define finline inline
-	#else
-		#define finline inline __attribute__((always_inline))
-	#endif
+#define finline inline __attribute__((always_inline))
 #endif
 
@@ -65,6 +60,6 @@
 /* check whether X is a signed integer */
 #define if_int(X) \
-	typename boost::enable_if<boost::is_integral<X>,void*>::type __i##X = NULL,\
-	typename boost::enable_if<boost::is_signed<X>,void*>::type __s##X = NULL
+	typename boost::enable_if<boost::is_integral<X>,int>::type __i##X = 0,\
+	typename boost::enable_if<boost::is_signed<X>,int>::type __s##X = 0
 
 /* signature conversion */
@@ -79,4 +74,3 @@
 CONVERT_SIGN( uint32_t, int32_t );
 CONVERT_SIGN( uint64_t, int64_t );
-
 #endif /* UTILITIES_HPP_ */