diff options
| -rw-r--r-- | cogl/cogl-util.c | 24 | ||||
| -rw-r--r-- | cogl/cogl-util.h | 10 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 37 insertions, 0 deletions
diff --git a/cogl/cogl-util.c b/cogl/cogl-util.c index e8ffb04e..9ecc34c2 100644 --- a/cogl/cogl-util.c +++ b/cogl/cogl-util.c @@ -25,6 +25,8 @@ #include "config.h" #endif +#include <string.h> + #include "cogl-util.h" #include "cogl-private.h" @@ -252,4 +254,26 @@ _cogl_util_pixel_format_from_masks (unsigned long r_mask, return image_format; } +#ifndef HAVE_MEMMEM + +char * +_cogl_util_memmem (const void *haystack, + size_t haystack_len, + const void *needle, + size_t needle_len) +{ + size_t i; + + if (needle_len > haystack_len) + return NULL; + + for (i = 0; i <= haystack_len - needle_len; i++) + if (!memcmp ((const char *) haystack + i, needle, needle_len)) + return (char *) haystack + i; + + return NULL; +} + +#endif /* HAVE_MEMMEM */ + #endif /* _COGL_IN_TEST_BITMASK */ diff --git a/cogl/cogl-util.h b/cogl/cogl-util.h index 67861bc5..4fb42274 100644 --- a/cogl/cogl-util.h +++ b/cogl/cogl-util.h @@ -268,4 +268,14 @@ _cogl_util_pixel_format_from_masks (unsigned long r_mask, #define _Static_assert(EXPRESSION, MESSAGE) #endif +#ifdef HAVE_MEMMEM +#define _cogl_util_memmem memmem +#else +char * +_cogl_util_memmem (const void *haystack, + size_t haystack_len, + const void *needle, + size_t needle_len); +#endif + #endif /* __COGL_UTIL_H */ diff --git a/configure.ac b/configure.ac index e6abb863..d3cc31bd 100644 --- a/configure.ac +++ b/configure.ac @@ -1103,6 +1103,9 @@ dnl The 'ffs' function is part of C99 so it isn't always dnl available. Cogl has a fallback if needed. AC_CHECK_FUNCS([ffs]) +dnl 'memmem' is a GNU extension but we have a simple fallback +AC_CHECK_FUNCS([memmem]) + dnl ================================================================ dnl Platform values dnl ================================================================ |