X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fconfig%2Fdefines.hpp;h=a8e995b31e3011942e39d32a4b48b0d4b143ba5f;hb=706c5ba5c35199816446453e6e144200cf79265b;hp=c8ff931f1e5a069b265aa56aecefe953349e0e14;hpb=5256cb543a9d35b610df19bd227cde977186aef0;p=anna.git

diff --git a/include/anna/config/defines.hpp b/include/anna/config/defines.hpp
index c8ff931..a8e995b 100644
--- a/include/anna/config/defines.hpp
+++ b/include/anna/config/defines.hpp
@@ -1,43 +1,18 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * 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.
-//     *  Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "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 COPYRIGHT
-// OWNER 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.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #ifndef anna_config_defines_hpp
 #define anna_config_defines_hpp
 
-#include <sys/types.h>
+//#include <sys/types.h>
+#include <stdint.h>
+// For cstd0x compatibility we will use stdint.h types instead of std:: ones on cstdint:
+//#include <cstdint>  when C++11 available
 
 #ifdef ANNA_FILE_LOCATION
 #undef ANNA_FILE_LOCATION
@@ -122,13 +97,16 @@
 namespace anna {
 #ifndef __x86_64__
 #undef  __anna64__
-/** Defines required data type to conversion from pointer to integer */
-typedef int ptrnumber;
+///** Defines required data type to conversion from pointer to integer */
+//typedef int ptrnumber;
 #else
 #define __anna64__
-/** Defines required data type to conversion from pointer to integer */
-typedef long ptrnumber;
+///** Defines required data type to conversion from pointer to integer */
+//typedef long ptrnumber;
 #endif
+
+typedef intptr_t ptrnumber;
+
 }
 
 /**