diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-06 22:50:27 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-06 22:50:27 +0000 |
commit | c3159f00c06944d6a97d735cae0265aabdc9ea10 (patch) | |
tree | a80c777a0647a439d314ba5f4094e75cf71b801c /utils | |
parent | cf382200105f9d651b1d280c28faf165fd63e634 (diff) |
Merged revisions 155121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r155121 | kpfleming | 2008-11-06 16:49:19 -0600 (Thu, 06 Nov 2008) | 3 lines
don't blindly assume that Darwin and Cygwin need GLOB_ABORTED defined; only define it if it is not already defined
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@155123 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
-rw-r--r-- | utils/extconf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/extconf.c b/utils/extconf.c index 6db4f6d8b..5003a5c6a 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -49,11 +49,14 @@ #include <pthread.h> #include <netdb.h> #include <sys/param.h> + #define ASINCLUDE_GLOB 1 #ifdef AST_INCLUDE_GLOB -#if defined(__Darwin__) || defined(__CYGWIN__) + +#if !defined(GLOB_ABORTED) #define GLOB_ABORTED GLOB_ABEND #endif + # include <glob.h> #endif |