Changeset 2798

Timestamp:

Sep 19, 2015, 10:35:03 PM (10 years ago)

Author:

bird

Message:

electric.*: Made it work with recent gcc versions.

Location:

trunk/src/kmk

Files:

• electric.c (modified) (3 diffs)
• electric.h (modified) (1 diff)

trunk/src/kmk/electric.c ¶

@@ -31 +31 @@
 #  include <sys/mman.h>
 #  include <errno.h>
+#  include <stdint.h>
 # endif
 # include <string.h>
@@ -157 +158 @@
 # endif
 }
+
 
 void *
@@ -193 +195 @@
 }
 
+# ifdef __GNUC__
+void *
+xmalloc_size_t (size_t size)
+{
+  return xmalloc(size);
+}
+
+void *
+xcalloc_size_t (size_t size, size_t items)
+{
+  return xcalloc(size * items);
+}
+
+void *
+xrealloc_size_t (void *ptr, size_t size)
+{
+  return xrealloc(ptr, size);
+}
+# endif /* __GNUC__ */
+
 #else /* !ELECTRIC_HEAP */
 extern void electric_heap_keep_ansi_c_quiet (void);

trunk/src/kmk/electric.h ¶

@@ -37 +37 @@
 void *xrealloc (void *, unsigned int);
 char *xstrdup (const char *);
+#ifdef __GNUC__
+void *xmalloc_size_t (size_t size);
+void *xcalloc_size_t (size_t size, size_t items);
+void *xrealloc_size_t (void *ptr, size_t size);
+#endif
 
+
+#undef  free
 #define free(a)         xfree(a)
-#define calloc(a,b)     xcalloc((a) * (b))
-#define malloc(a)       xmalloc(a)
-#define realloc(a,b)    xrealloc((a),(b))
+#undef  strdup
 #define strdup(a)       xstrdup(a)
+
+#undef  calloc
+#undef  malloc
+#undef  realloc
+#ifdef __GNUC__
+# define calloc(a,b)     xcalloc_size_t(a,b)
+# define malloc(a)       xmalloc_size_t(a)
+# define realloc(a,b)    xrealloc_size_t(a,b)
+#else
+# define calloc(a,b)     xcalloc((a) * (b))
+# define malloc(a)       xmalloc(a)
+# define realloc(a,b)    xrealloc((a),(b))
+#endif
 
 #endif