diff options
| author | Moritz Schulte <mo@g10code.com> | 2005-10-16 08:45:41 +0000 |
|---|---|---|
| committer | Moritz Schulte <mo@g10code.com> | 2005-10-16 08:45:41 +0000 |
| commit | 66721a14e67327727531f62c2881529a0d4d8bbc (patch) | |
| tree | 3ae14b1b112955689bb273fd8cbf32db06449cdb /src/g10lib.h | |
| parent | 92561cf910b42d7902fabd635c0840bd1f565d6f (diff) | |
| download | libgcrypt-66721a14e67327727531f62c2881529a0d4d8bbc.tar.gz | |
2005-10-16 Moritz Schulte <moritz@g10code.com>
* g10lib.h: Removed GCC_ATTR_PURE macro definitions, since
gcrypt.h does already contain such a macro named
_GCRY_GCC_ATTR_PURE, which we can use here as well.
Likewise for GCC_ATTR_MALLOC and _GCRY_GCC_ATTR_MALLOC.
* stdmem.h: Use _GCRY_GCC_ATTR_MALLOC instead of GCC_ATTR_MALLOC.
* secmem.h: Likewise.
Diffstat (limited to 'src/g10lib.h')
| -rw-r--r-- | src/g10lib.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/g10lib.h b/src/g10lib.h index 7655fccb..db6b307e 100644 --- a/src/g10lib.h +++ b/src/g10lib.h @@ -55,19 +55,6 @@ #define GCC_ATTR_NORETURN #endif -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96 ) -#define GCC_ATTR_PURE __attribute__ ((__pure__)) -#else -#define GCC_ATTR_PURE -#endif - -/* (The malloc attribute might be defined prior to 3.2 - I am just not sure) */ -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2 ) -#define GCC_ATTR_MALLOC __attribute__ ((__malloc__)) -#else -#define GCC_ATTR_MALLOC -#endif - /* Gettext macros. */ #define _(a) _gcry_gettext(a) @@ -142,7 +129,7 @@ gcry_mpi_t _gcry_generate_elg_prime( int mode, unsigned pbits, unsigned qbits, char *stpcpy (char *a, const char *b); #endif #ifndef HAVE_STRCASECMP -int strcasecmp (const char *a, const char *b) GCC_ATTR_PURE; +int strcasecmp (const char *a, const char *b) _GCRY_GCC_ATTR_PURE; #endif /* macros used to rename missing functions */ @@ -204,7 +191,8 @@ struct gcry_module { struct gcry_module *next; /* List pointers. */ struct gcry_module **prevp; - void *spec; /* The acctual specs. */ + void *spec; /* Pointer to the subsystem-specific + specification structure. */ int flags; /* Associated flags. */ int counter; /* Use counter. */ unsigned int mod_id; /* ID of this module. */ |