Changeset 4836Tweet

Timestamp:

Aug 5, 2012, 2:24:53 PM (8 years ago)

Author:

Sam Hocevar

Message:

build: fix compilation by including <wchar.h> and checking for regwexec.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• msvc/config.h (modified) (1 diff)
• src/common/fd.c (modified) (2 diffs)
• src/common/fd.h (modified) (1 diff)

zzuf/trunk/configure.ac

@@ -66 +66 @@
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)
+AC_CHECK_FUNCS(regexec regwexec)
 AC_CHECK_FUNCS(dup dup2 ftello fseeko _IO_getc getline getdelim fgetln map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize)
 AC_CHECK_FUNCS(getc_unlocked getchar_unlocked fgetc_unlocked fread_unlocked fgets_unlocked)

zzuf/trunk/msvc/config.h

@@ -82 +82 @@
 #define HAVE_RECVFROM 1
 /* #undef HAVE_RECVMSG */
-/* #undef HAVE_REGEX_H */
+/* #undef HAVE_REGEXEC */
 #define HAVE_REGEX_H 1
+#define HAVE_REGWEXEC 1
 #define HAVE_REOPENFILE 1
 /* #undef HAVE_SETENV */

zzuf/trunk/src/common/fd.c

@@ -200 +200 @@
 int _zz_mustwatch(char const *file)
 {
-#if defined HAVE_REGEX_H
+#if defined HAVE_REGEXEC
     if(has_include && regexec(&re_include, file, 0, NULL, 0) == REG_NOMATCH)
         return 0; /* not included: ignore */
@@ -215 +215 @@
 int _zz_mustwatchw(wchar_t const *file)
 {
-#if defined HAVE_REGEX_H
+#if defined HAVE_REGWEXEC
     if(has_include && regwexec(&re_include, file, 0, NULL, 0) == REG_NOMATCH)
         return 0; /* not included: ignore */

zzuf/trunk/src/common/fd.h

@@ -14 +14 @@
  *  fd.h: file descriptor functions
  */
+
+#include <stdint.h>
+#include <wchar.h>
 
 extern void _zz_include(char const *);