Author: Andreas Tille <tille@debian.org>
Last-Update: 2017-06-24
Description: Add missing declaration, fix name of BEAGLE constant

--- phyml.orig/src/utilities.c
+++ phyml/src/utilities.c
@@ -2203,6 +2203,9 @@
         }
     }
   
+#ifdef BEAGLE
+  int temp;
+#endif
   
   for(i=0;i<data->n_otu-1;i++)
     for(j=i+1;j<data->n_otu;j++)
@@ -6705,6 +6708,9 @@
   int *buff_p_lk_loc, *buff_patt_id;
   phydbl *buff_p_lk_tip;
   int *buff_ui;
+#ifdef BEAGLE
+  int temp;
+#endif
   
   if(side_a == LEFT && side_b == LEFT)
     {
--- phyml.orig/src/beagle_utils.c
+++ phyml/src/beagle_utils.c
@@ -53,7 +53,7 @@
     if (inFlags & BEAGLE_FLAG_SCALING_ALWAYS)     fprintf(stdout, " SCALING_ALWAYS");
     if (inFlags & BEAGLE_FLAG_SCALING_DYNAMIC)    fprintf(stdout, " SCALING_DYNAMIC");
     if (inFlags & BEAGLE_FLAG_SCALERS_RAW)        fprintf(stdout, " SCALERS_RAW");
-    if (inFlags & BEAGLE_FLAG_SCALERS_log)        fprintf(stdout, " SCALERS_log");
+    if (inFlags & BEAGLE_FLAG_SCALERS_LOG)        fprintf(stdout, " SCALERS_LOG");
     if (inFlags & BEAGLE_FLAG_VECTOR_NONE)        fprintf(stdout, " VECTOR_NONE");
     if (inFlags & BEAGLE_FLAG_VECTOR_SSE)         fprintf(stdout, " VECTOR_SSE");
     if (inFlags & BEAGLE_FLAG_VECTOR_AVX)         fprintf(stdout, " VECTOR_AVX");