[tor-commits] [tor-browser/tor-browser-45.5.0esr-6.5-1] Revert "Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas"

[gk at torproject.org]

commit 0cd759ac3d4e93b0eeaf6f341110deda34548291
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Nov 10 21:34:03 2016 +0000

    Revert "Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas"
    
    This reverts commit 0be815c12ed7baeedcd80893f8f1135eb37e650b.
    
    Was needed for GCC 6.2.0 which we don't use.
---
 gfx/graphite2/src/moz.build | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
index c18c6f4..4008b77 100644
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -45,6 +45,7 @@ UNIFIED_SOURCES += [
     'Intervals.cpp',
     'json.cpp',
     'Justifier.cpp',
+    'NameTable.cpp',
     'Pass.cpp',
     'Position.cpp',
     'SegCache.cpp',
@@ -58,12 +59,6 @@ UNIFIED_SOURCES += [
     'UtfCodec.cpp',
 ]
 
-# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it,
-# see bug 1272647.
-SOURCES += [
-    'NameTable.cpp',
-]
-
 # tell graphite2 not to export symbols, we'll be linking it directly with
 # thebes
 DEFINES['GRAPHITE2_STATIC'] = True