Title: [144102] tags/Safari-537.31.10/Source

Diff

Modified: tags/Safari-537.31.10/Source/_javascript_Core/ChangeLog (144101 => 144102)


--- tags/Safari-537.31.10/Source/_javascript_Core/ChangeLog	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/_javascript_Core/ChangeLog	2013-02-26 21:40:09 UTC (rev 144102)
@@ -1,5 +1,15 @@
 2013-02-26  Lucas Forschler  <lforsch...@apple.com>
 
+        Merge r144091
+
+    2013-02-26  Jer Noble  <jer.no...@apple.com>
+
+            Unreviewed build fix; use correct macro for platform name in FeatureDefines.xcconfig.
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2013-02-26  Lucas Forschler  <lforsch...@apple.com>
+
         Merge r143509
 
     2013-02-19  Jer Noble  <jer.no...@apple.com>

Modified: tags/Safari-537.31.10/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (144101 => 144102)


--- tags/Safari-537.31.10/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:09 UTC (rev 144102)
@@ -70,7 +70,7 @@
 ENABLE_ENCRYPTED_MEDIA_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(REAL_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(PLATFORM_NAME));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx = $(ENABLE_ENCRYPTED_MEDIA_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;

Modified: tags/Safari-537.31.10/Source/WebCore/ChangeLog (144101 => 144102)


--- tags/Safari-537.31.10/Source/WebCore/ChangeLog	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/WebCore/ChangeLog	2013-02-26 21:40:09 UTC (rev 144102)
@@ -1,5 +1,15 @@
 2013-02-26  Lucas Forschler  <lforsch...@apple.com>
 
+        Merge r144091
+
+    2013-02-26  Jer Noble  <jer.no...@apple.com>
+
+            Unreviewed build fix; use correct macro for platform name in FeatureDefines.xcconfig.
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2013-02-26  Lucas Forschler  <lforsch...@apple.com>
+
         Merge r143984
 
     2013-02-25  Jer Noble  <jer.no...@apple.com>

Modified: tags/Safari-537.31.10/Source/WebCore/Configurations/FeatureDefines.xcconfig (144101 => 144102)


--- tags/Safari-537.31.10/Source/WebCore/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/WebCore/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:09 UTC (rev 144102)
@@ -70,7 +70,7 @@
 ENABLE_ENCRYPTED_MEDIA_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(REAL_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(PLATFORM_NAME));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx = $(ENABLE_ENCRYPTED_MEDIA_V2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;

Modified: tags/Safari-537.31.10/Source/WebKit/mac/ChangeLog (144101 => 144102)


--- tags/Safari-537.31.10/Source/WebKit/mac/ChangeLog	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/WebKit/mac/ChangeLog	2013-02-26 21:40:09 UTC (rev 144102)
@@ -1,5 +1,15 @@
 2013-02-26  Lucas Forschler  <lforsch...@apple.com>
 
+        Merge r144091
+
+    2013-02-26  Jer Noble  <jer.no...@apple.com>
+
+            Unreviewed build fix; use correct macro for platform name in FeatureDefines.xcconfig.
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2013-02-26  Lucas Forschler  <lforsch...@apple.com>
+
         Merge r143984
 
     2013-02-25  Jer Noble  <jer.no...@apple.com>

Modified: tags/Safari-537.31.10/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (144101 => 144102)


--- tags/Safari-537.31.10/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:09 UTC (rev 144102)
@@ -70,7 +70,7 @@
 ENABLE_ENCRYPTED_MEDIA_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(REAL_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(PLATFORM_NAME));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx = $(ENABLE_ENCRYPTED_MEDIA_V2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;

Modified: tags/Safari-537.31.10/Source/WebKit2/ChangeLog (144101 => 144102)


--- tags/Safari-537.31.10/Source/WebKit2/ChangeLog	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/WebKit2/ChangeLog	2013-02-26 21:40:09 UTC (rev 144102)
@@ -1,5 +1,15 @@
 2013-02-26  Lucas Forschler  <lforsch...@apple.com>
 
+        Merge r144091
+
+    2013-02-26  Jer Noble  <jer.no...@apple.com>
+
+            Unreviewed build fix; use correct macro for platform name in FeatureDefines.xcconfig.
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2013-02-26  Lucas Forschler  <lforsch...@apple.com>
+
         Merge r143984
 
     2013-02-25  Jer Noble  <jer.no...@apple.com>

Modified: tags/Safari-537.31.10/Source/WebKit2/Configurations/FeatureDefines.xcconfig (144101 => 144102)


--- tags/Safari-537.31.10/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:08 UTC (rev 144101)
+++ tags/Safari-537.31.10/Source/WebKit2/Configurations/FeatureDefines.xcconfig	2013-02-26 21:40:09 UTC (rev 144102)
@@ -70,7 +70,7 @@
 ENABLE_ENCRYPTED_MEDIA_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1080 = ;
 ENABLE_ENCRYPTED_MEDIA_macosx_1090 = ENABLE_ENCRYPTED_MEDIA;
-ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(REAL_PLATFORM_NAME));
+ENABLE_ENCRYPTED_MEDIA_V2 = $(ENABLE_ENCRYPTED_MEDIA_V2_$(PLATFORM_NAME));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx = $(ENABLE_ENCRYPTED_MEDIA_V2_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1070 = ;
 ENABLE_ENCRYPTED_MEDIA_V2_macosx_1080 = ;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to