Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  rework libc++ patch to use AvailabilityMacros.h instead of Availability.h

Conflicts:
	src/input/readers/Ascii.cc
This commit is contained in:
Robin Sommer 2013-10-24 14:01:21 -07:00
commit 1f91b2936e
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,5 +1,7 @@
2.2-beta-139 | 2013-10-24 13:06:29 -0700
2.2-beta-143 | 2013-10-24 14:01:21 -0700
* Intel framework notes added to NEWS (Seth Hall)
* Temporary OSX Mavericks libc++ issue workaround for getline()
problem in ASCII reader. (Bernhard Amann)

2
VERSION
View file

@ -1 +1 @@
2.2-beta-139
2.2-beta-143

6
src/input/readers/Ascii.cc
View file

@ -19,12 +19,14 @@
#ifdef __clang__
# ifdef __APPLE__
# include <Availability.h>
# ifdef __MAC_10_9
# include <AvailabilityMacros.h>
# ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
# if __MAC_OS_X_VERSION_MAX_ALLOWED == 1090
# define MAVERICKS_WORKAROUND
# endif
# endif
# endif
#endif
using namespace input::reader;
using threading::Value;