X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Futil%2Fdefines.hpp;h=077dd961904597a47043a9386bed66a1f113ea68;hb=c377f6f51a72b35d5d0b341c624e8bad55baeea4;hp=066dd15e3c3aa1333378febef3c361a3a3c70869;hpb=a97d4f54eb576a7c72e933fb3af992e9de8e5473;p=anna.git diff --git a/include/anna/core/util/defines.hpp b/include/anna/core/util/defines.hpp index 066dd15..077dd96 100644 --- a/include/anna/core/util/defines.hpp +++ b/include/anna/core/util/defines.hpp @@ -1,8 +1,8 @@ -// ANNA - Anna is Not 'N' Anymore +// ANNA - Anna is Not Nothingness Anymore // // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo // -// https://bitbucket.org/testillano/anna +// 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 @@ -14,7 +14,7 @@ // 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 Google Inc. nor the names of its +// * 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. // @@ -112,11 +112,24 @@ typedef unsigned int U32; /** Alias for int: signed integer with 32 bits */ typedef int S32; +///** Alias for unsigned long long: unsigned integer with 64 bits */ +//typedef unsigned long long int U64; +// +///** Alias for long long: signed integer with 64 bits */ +//typedef long long int S64; +#ifndef __x86_64__ +#undef __anna64__ +/** Alias for long long: signed integer with 64 bits */ +typedef int64_t S64 /** Alias for unsigned long long: unsigned integer with 64 bits */ -typedef unsigned long long int U64; - +typedef u_int64_t U64; +#else +#define __anna64__ /** Alias for long long: signed integer with 64 bits */ typedef long long int S64; +/** Alias for unsigned long long: unsigned integer with 64 bits */ +typedef unsigned long long int U64; +#endif /** Alias for float: floating number with 32 bits (1-8-23) */ typedef float F32;