Merged revisions 309251 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r309251 | tilghman | 2011-03-01 19:06:02 -0600 (Tue, 01 Mar 2011) | 7 lines
  
  Revert previous 2 commits, and instead conditionally redefine the same macro used in flex 2.5.35 that clashed with our workaround.
  
  Not surprisingly, the workaround was exactly the same code as was provided by
  the Flex maintainers, albeit in two different places, in different macros.
  
  This should fix the FreeBSD builds, which have an older version of Flex.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@309808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2011-03-07 00:54:42 +00:00
parent c8876e8ca6
commit 56cd7709a5
6 changed files with 53 additions and 151 deletions

View File

@@ -1091,10 +1091,6 @@
/* Build chan_misdn for mISDN 1.2 or later. */
#undef MISDN_1_2
/* Define to 1 if your system has a version of flex that does not check the
return value of fwrite. */
#undef NEED_FLEX_FWRITE_WORKAROUND
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT