pike.git/ src/ pike_memory.h

2014-12-04

2014-12-04 19:23:20 by Per Hedbor <ph@opera.com>

• b9bc9fbb9a71b636b0a7050a57822c09272015e2 (8 lines) (+5/-3) ^{[ Show | Annotate ]}
  Branch: bill/master_archive_support

Two fixes for C++ compilation.

Explicit casts in guaranteed_memset and external declare low_hashmem
when it is a variable to avoid having multiple instances of it.

136:    * sensitive data has to be cleared from memory.    */   static INLINE void * guaranteed_memset(void * p, int c, size_t n) { -  volatile char * _p = p; +  volatile char * _p = (char *)p;    while (n--) *_p++ = c; -  return p; +  return (void *)p;   }      #include "pike_search.h"
159:   PMOD_EXPORT void reorder(char *memory, INT32 nitems, INT32 size,INT32 *order);      #if (defined(__i386__) || defined(__amd64__)) && defined(__GNUC__) + PMOD_EXPORT   #ifdef __i386__   __attribute__((fastcall))   #endif