Changeset 8485d99 for lib

Timestamp:

08/29/16 16:14:27 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

99be155

Parents:

ee6e802

Message:

Fix files I broke with my automatic relicensing...

Location:

lib

Files:

• common.h (modified) (1 diff)
• malloc.c (modified) (1 diff)
• realloc.c (modified) (1 diff)

lib/common.h

@@ -24 +24 @@
  *
  */
+
+#ifndef COMMON_H
+#define COMMON_H 1
+
+#include "config.h"
+
+#ifdef __cplusplus
+#  define BEGIN_C_DECLS extern "C" {
+#  define END_C_DECLS   }
+#else /* !__cplusplus */
+#  define BEGIN_C_DECLS
+#  define END_C_DECLS
+#endif /* __cplusplus */
+
+
+#endif /* COMMON_H */

lib/malloc.c

@@ -24 +24 @@
  *
  */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+#undef malloc
+
+#include <sys/types.h>
+#include <stdlib.h>
+
+void *malloc ();
+
+/* Allocate an N-byte block of memory from the heap.
+ * If N is zero, allocate a 1-byte block */
+
+void *
+rpl_malloc(size_t n)
+{
+        if (n == 0)
+                n = 1;
+        return malloc(n);
+}

lib/realloc.c

@@ -24 +24 @@
  *
  */
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+#undef realloc
+
+#include <sys/types.h>
+#include <stdlib.h>
+
+void *realloc ();
+
+
+/* If N is zero, allocate a 1-byte block */
+void *
+rpl_realloc(void *ptr,size_t n)
+{
+        
+        if (n == 0)
+                n = 1;
+        if (ptr == 0)
+                return malloc(n);
+        return realloc(ptr,n);
+}