Enable PSVita (arm-none-eabi) compile again and add it to CI (#594)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4835e4..8563590 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,5 @@
 version: 2
 
-branches:
-  ignore:
-      - gh-pages
 jobs:
 
   base:
@@ -13,6 +10,15 @@ jobs:
       - run: apt update && apt install ragel
       - run: cmake -Bbuild -H. -GNinja && ninja -Cbuild
 
+  psvita:
+    docker:
+      - image: dockcross/base
+    steps:
+      - checkout
+      - run: apt update && apt install ragel
+      - run: git clone https://github.com/vitasdk/vdpm && cd vdpm && ./bootstrap-vitasdk.sh
+      - run: cmake -Bbuild -H. -GNinja -DCMAKE_TOOLCHAIN_FILE=/usr/local/vitasdk/share/vita.toolchain.cmake && ninja -Cbuild
+
   android-arm:
     docker:
       - image: dockcross/android-arm
@@ -58,8 +64,13 @@ workflows:
   build:
     jobs:
       - base
+      - psvita
       - android-arm
       - browser-asmjs
       - linux-arm64
       - linux-mips
       - windows-x64
+
+branches:
+  ignore:
+      - gh-pages

diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index 1aa87b6..0b8d7c8 100644 (file)
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -311,7 +311,7 @@ struct hb_buffer_t {
                                     unsigned int cluster) const
   {
     for (unsigned int i = start; i < end; i++)
-      cluster = MIN (cluster, info[i].cluster);
+      cluster = MIN<unsigned int> (cluster, info[i].cluster);
     return cluster;
   }
   void

diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index 73b3e4b..f079178 100644 (file)
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -554,7 +554,7 @@ hb_buffer_t::merge_clusters_impl (unsigned int start,
   unsigned int cluster = info[start].cluster;
 
   for (unsigned int i = start + 1; i < end; i++)
-    cluster = MIN (cluster, info[i].cluster);
+    cluster = MIN<unsigned int> (cluster, info[i].cluster);
 
   /* Extend end */
   while (end < len && info[end - 1].cluster == info[end].cluster)
@@ -585,7 +585,7 @@ hb_buffer_t::merge_out_clusters (unsigned int start,
   unsigned int cluster = out_info[start].cluster;
 
   for (unsigned int i = start + 1; i < end; i++)
-    cluster = MIN (cluster, out_info[i].cluster);
+    cluster = MIN<unsigned int> (cluster, out_info[i].cluster);
 
   /* Extend start */
   while (start && out_info[start - 1].cluster == out_info[start].cluster)

diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index a6d5a6b..741e74c 100644 (file)
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -90,7 +90,7 @@ typedef struct OffsetTable
       if (start_offset >= tables.len)
         *table_count = 0;
       else
-        *table_count = MIN (*table_count, tables.len - start_offset);
+        *table_count = MIN<unsigned int> (*table_count, tables.len - start_offset);
 
       const TableRecord *sub_tables = tables.array + start_offset;
       unsigned int count = *table_count;