[HarfBuzz] harfbuzz-ng: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-object-private.hh |    2 +-
 util/options.cc          |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a097043f9a81e6c20caf69a5dabdf9e00438d79b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jan 14 17:55:51 2012 -0500

    Allow space in one more place when parsing features

diff --git a/util/options.cc b/util/options.cc
index a3da825..2f201c5 100644
--- a/util/options.cc
+++ b/util/options.cc
@@ -269,6 +269,8 @@ parse_feature_tag (char **pp, hb_feature_t *feature)
 static hb_bool_t
 parse_feature_indices (char **pp, hb_feature_t *feature)
 {
+  parse_space (pp);
+
   hb_bool_t has_start;
 
   feature->start = 0;
commit af92135424b994062648f4fb7e26af0bd970a4b1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Oct 21 09:18:43 2011 -0700

    Minor

diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh
index 6a2f83d..2e4a385 100644
--- a/src/hb-object-private.hh
+++ b/src/hb-object-private.hh
@@ -63,7 +63,7 @@ typedef volatile int hb_atomic_int_t;
 #define hb_atomic_int_set(AI, V)	g_atomic_int_set (&(AI), V)
 
 
-#elif _MSC_VER >= 1600
+#elif defined(_MSC_VER) && _MSC_VER >= 1600
 
 #include <intrin.h>