Remove some functions from pgmspace.h that break on cygwin

Somehow, these functions cannot be found when compiling the test build
under cygwin, even though it seems they should be available. To at least
allow the rest of the fixes in this series to be merged, disable these
functions for now. Since these are mostly uncommon functions that are
unlikely to be used in actual Arduino code, this should probably not
cause much problems for now.

Author: matthijskooijman

cpp/arduino/avr/pgmspace.h

@@ -59,49 +59,53 @@ typedef uintptr_t uint_farptr_t;
 
 inline const void * memchr_P(const void *s, int val, size_t len) { return memchr(s, val, len); }
 inline int memcmp_P(const void *s1, const void *s2, size_t len) { return memcmp(s1, s2, len); }
-inline void *memccpy_P(void *dest, const void *src, int val, size_t len) { return memccpy(dest, src, val, len); }
 inline void *memcpy_P(void *dest, const void *src, size_t n) { return memcpy(dest, src, n); }
-inline void *memmem_P(const void *s1, size_t len1, const void *s2, size_t len2) { return memmem(s1, len1, s2, len2); }
-inline const void *memrchr_P(const void *src, int val, size_t len) { return memrchr(src, val, len); }
 inline char *strcat_P(char *dest, const char *src) { return strcat(dest, src); }
 inline const char *strchr_P(const char *s, int val) { return strchr(s, val); }
-inline const char *strchrnul_P(const char *s, int c) { return strchrnul(s, c); }
 inline int strcmp_P(const char *s1, const char *s2) { return strcmp(s1, s2); }
 inline char *strcpy_P(char *dest, const char *src) { return strcpy(dest, src); }
-inline int strcasecmp_P(const char *s1, const char *s2) { return strcasecmp(s1, s2); }
-inline char *strcasestr_P(const char *s1, const char *s2) { return (char*)strcasestr(s1, s2); }
 inline size_t strcspn_P(const char *s, const char *reject) { return strcspn(s, reject); }
 // strlcat and strlcpy are AVR-specific and not entirely trivial to reimplement using strncat it seems
 //inline size_t strlcat_P(char *dst, const char *src, size_t siz) { return strlcat(dst, src, siz); }
 //inline size_t strlcpy_P(char *dst, const char *src, size_t siz) { return strlcpy(dst, src, siz); }
 //inline size_t strlcat_PF(char *dst, uint_farptr_t src, size_t n) { return strlcat(dst, (const char*)src, n); }
 //inline size_t strlcpy_PF(char *dst, uint_farptr_t src, size_t siz) { return strlcpy(dst, (const char*)src, siz); }
 inline int strncmp_P(const char *s1, const char *s2, size_t n) { return strncmp(s1, s2, n); }
-inline int strncasecmp_P(const char *s1, const char *s2, size_t n) { return strncasecmp(s1, s2, n); }
 inline char *strncat_P(char *dest, const char *src, size_t len) { return strncat(dest, src, len); }
 inline char *strncpy_P(char *dest, const char *src, size_t n) { return strncpy(dest, src, n); }
 inline char *strpbrk_P(const char *s, const char *accept) { return (char*)strpbrk(s, accept); }
 inline const char *strrchr_P(const char *s, int val) { return strrchr(s, val); }
-inline char *strsep_P(char **sp, const char *delim) { return strsep(sp, delim); }
 inline size_t strspn_P(const char *s, const char *accept) { return strspn(s, accept); }
 inline char *strstr_P(const char *s1, const char *s2) { return (char*)strstr(s1, s2); }
 inline char *strtok_P(char *s, const char * delim) { return strtok(s, delim); }
-inline char *strtok_r_P(char *string, const char *delim, char **last) { return strtok_r(string, delim, last); }
 inline size_t strlen_PF(uint_farptr_t s) { return strlen((char*)s); }
-inline size_t strnlen_P(uint_farptr_t s, size_t len) { return strnlen((char*)s, len); }
 inline void *memcpy_PF(void *dest, uint_farptr_t src, size_t n) { return memcpy(dest, (const char*)src, n); }
 inline char *strcpy_PF(char *dst, uint_farptr_t src) { return strcpy(dst, (const char*)src); }
 inline char *strncpy_PF(char *dst, uint_farptr_t src, size_t n) { return strncpy(dst, (const char*)src, n); }
 inline char *strcat_PF(char *dst, uint_farptr_t src) { return strcat(dst, (const char*)src); }
 inline char *strncat_PF(char *dst, uint_farptr_t src, size_t n) { return strncat(dst, (const char*)src, n); }
 inline int strcmp_PF(const char *s1, uint_farptr_t s2) { return strcmp(s1, (const char*)s2); }
 inline int strncmp_PF(const char *s1, uint_farptr_t s2, size_t n) { return strncmp(s1, (const char*)s2, n); }
-inline int strcasecmp_PF(const char *s1, uint_farptr_t s2) { return strcasecmp(s1, (const char*)s2); }
-inline int strncasecmp_PF(const char *s1, uint_farptr_t s2, size_t n) { return strncasecmp(s1, (const char*)s2, n); }
 inline char *strstr_PF(const char *s1, uint_farptr_t s2) { return (char*)strstr(s1, (const char*)s2); }
 inline int memcmp_PF(const void *s1, uint_farptr_t s2, size_t len) { return memcmp(s1, (const char*)s2, len); }
 inline size_t strlen_P(const char *src) { return strlen(src); }
 
+// TODO: These functions cannot be found on the CYGWIN test build for
+// some reason, so disable them for now. Most of these are less common
+// and/or GNU-specific addons anyway
+//inline void *memccpy_P(void *dest, const void *src, int val, size_t len) { return memccpy(dest, src, val, len); }
+//inline void *memmem_P(const void *s1, size_t len1, const void *s2, size_t len2) { return memmem(s1, len1, s2, len2); }
+//inline const void *memrchr_P(const void *src, int val, size_t len) { return memrchr(src, val, len); }
+//inline const char *strchrnul_P(const char *s, int c) { return strchrnul(s, c); }
+//inline int strcasecmp_P(const char *s1, const char *s2) { return strcasecmp(s1, s2); }
+//inline char *strcasestr_P(const char *s1, const char *s2) { return (char*)strcasestr(s1, s2); }
+//inline int strncasecmp_P(const char *s1, const char *s2, size_t n) { return strncasecmp(s1, s2, n); }
+//inline char *strsep_P(char **sp, const char *delim) { return strsep(sp, delim); }
+//inline char *strtok_r_P(char *string, const char *delim, char **last) { return strtok_r(string, delim, last); }
+//inline int strcasecmp_PF(const char *s1, uint_farptr_t s2) { return strcasecmp(s1, (const char*)s2); }
+//inline int strncasecmp_PF(const char *s1, uint_farptr_t s2, size_t n) { return strncasecmp(s1, (const char*)s2, n); }
+//inline size_t strnlen_P(uint_farptr_t s, size_t len) { return strnlen((char*)s, len); }
+
 // These are normally defined by stdio.h on AVR, but we cannot override that
 // include file (at least not without no longer being able to include the
 // original as well), so just define these here. It seems likely that any