diff options
| author | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-21 15:20:22 +0000 |
|---|---|---|
| committer | dbailey <dbailey@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-21 15:20:22 +0000 |
| commit | 772414a4d7aca4bac4b5bd0a6d53ebd282dfd529 (patch) | |
| tree | cf1a70c72dc3b330ba2fba748b78a9b04076a4ec /main | |
| parent | d7618b6953f3e8c1eb6fb01ff5f8b0f3936a8018 (diff) | |
Merged revisions 189629 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r189629 | dbailey | 2009-04-21 09:28:04 -0500 (Tue, 21 Apr 2009) | 10 lines
Merged revisions 189601 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r189601 | dbailey | 2009-04-21 09:00:55 -0500 (Tue, 21 Apr 2009) | 3 lines
Add check in configure script to check for GLOB_NOMAGIC and GLOB_BRACE in glob.h
This allows config.c to compile when linked against uclibc that does not support these parameters
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@189642 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/main/config.c b/main/config.c index 3725e958a..fdc1e7a4f 100644 --- a/main/config.c +++ b/main/config.c @@ -39,24 +39,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define AST_INCLUDE_GLOB 1 -#ifdef AST_INCLUDE_GLOB -/* glob compat stuff - eventually this should go in compat.h or some - * header in include/asterisk/ - */ -#if defined(__Darwin__) || defined(__CYGWIN__) -#define GLOB_ABORTED GLOB_ABEND -#endif - -#include <glob.h> - -#ifdef SOLARIS -#define MY_GLOB_FLAGS GLOB_NOCHECK -#else -#define MY_GLOB_FLAGS (GLOB_NOMAGIC|GLOB_BRACE) -#endif - -#endif - #include "asterisk/config.h" #include "asterisk/cli.h" #include "asterisk/lock.h" |