X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=include%2Flibfirm%2Fadt%2Fhashptr.h;h=7a369c5fe60ac9d128777a031aadc702bd654773;hb=acbdf295cc01d5b69b1cb8ea2c7764dca1e7b8ac;hp=e868d60cda82db299532f886bbde11450bfc8055;hpb=b2e280bcb4dcde092a0971ea045ee1269b114c4f;p=libfirm diff --git a/include/libfirm/adt/hashptr.h b/include/libfirm/adt/hashptr.h index e868d60cd..7a369c5fe 100644 --- a/include/libfirm/adt/hashptr.h +++ b/include/libfirm/adt/hashptr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -26,16 +26,13 @@ #ifndef FIRM_ADT_HASHPTR_H #define FIRM_ADT_HASHPTR_H -#include "firm_config.h" -#include "compiler.h" - #define _FIRM_FNV_OFFSET_BASIS 2166136261U #define _FIRM_FNV_FNV_PRIME 16777619U /* Computing x * _FIRM_FNV_FNV_PRIME */ #define _FIRM_FNV_TIMES_PRIME(x) ((x) * _FIRM_FNV_FNV_PRIME) -static INLINE unsigned firm_fnv_hash(const unsigned char *data, unsigned bytes) +static inline unsigned firm_fnv_hash(const unsigned char *data, unsigned bytes) { unsigned i; unsigned hash = _FIRM_FNV_OFFSET_BASIS; @@ -48,7 +45,7 @@ static INLINE unsigned firm_fnv_hash(const unsigned char *data, unsigned bytes) return hash; } -static INLINE unsigned firm_fnv_hash_str(const char *data) +static inline unsigned firm_fnv_hash_str(const char *data) { unsigned i; unsigned hash = _FIRM_FNV_OFFSET_BASIS; @@ -79,7 +76,7 @@ static INLINE unsigned firm_fnv_hash_str(const char *data) #pragma warning(disable:4307) #endif /* _MSC_VER */ -static INLINE unsigned _hash_combine(unsigned x, unsigned y) +static inline unsigned _hash_combine(unsigned x, unsigned y) { unsigned hash = _FIRM_FNV_TIMES_PRIME(_FIRM_FNV_OFFSET_BASIS); hash ^= x;