Changeset 47d64ce for lib

Timestamp:

07/02/18 12:03:52 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance

Children:

c7a320a

Parents:

8f5d454 (diff), 823d8e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'fix-check-funcs' of ​git://github.com/alistairking/libtrace into alistairking-fix-check-funcs

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• libtrace_int.h (modified) (2 diffs)
• strndup.c (modified) (1 diff)

lib/Makefile.am

@@ -78 +78 @@
                 data-struct/buckets.c data-struct/simple_circular_buffer.c \
                 combiner_sorted.c combiner_unordered.c \
-                pthread_spinlock.c pthread_spinlock.h
+                pthread_spinlock.c pthread_spinlock.h \
+                strndup.c
 
 if DAG2_4

lib/libtrace_int.h

@@ -99 +99 @@
 #endif
 
-#ifndef HAVE_STRNDUP
+#if !HAVE_DECL_STRNDUP
 char *strndup(const char *s, size_t size);
 #endif
 
-#ifndef HAVE_STRNCASECMP
+#if !HAVE_DECL_STRNCASECMP
 # ifndef HAVE__STRNICMP
 /** A local implementation of strncasecmp (as some systems do not have it) */
@@ -112 +112 @@
 #endif
 
-#ifndef HAVE_SNPRINTF
+#if !HAVE_DECL_SNPRINTF
 # ifndef HAVE_SPRINTF_S
 /** A local implementation of snprintf (as some systems do not have it) */

lib/strndup.c

@@ -24 +24 @@
  *
  */
-#ifndef HAVE_STRNDUP
+#include "config.h"
+#if !HAVE_DECL_STRNDUP
 
 #include <stdlib.h>