X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsn-apply.c;h=3694f039b8fdfd794e5d692e754c401b3e1535e4;hb=79789cfc25a65312d8b91000abc7eb9209322555;hp=47930978456a77a03a48895baade6806a8cef498;hpb=ca174a94bbc1fc36688a3e130665a64a9dc1690b;p=sort-networks.git

diff --git a/src/sn-apply.c b/src/sn-apply.c
index 4793097..3694f03 100644
--- a/src/sn-apply.c
+++ b/src/sn-apply.c
@@ -19,8 +19,12 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-#define _ISOC99_SOURCE
-#define _POSIX_C_SOURCE 200112L
+#ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE
+#endif
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -138,23 +142,9 @@ static int show_sort (int *values)
   for (i = 0; i < stages_num; i++)
   {
     sn_stage_t *s;
-    int j;
 
     s = SN_NETWORK_STAGE_GET (network, i);
-
-    for (j = 0; j < SN_STAGE_COMP_NUM (s); j++)
-    {
-      sn_comparator_t *c;
-
-      c = SN_STAGE_COMP_GET (s, j);
-
-      if (values[c->min] > values[c->max])
-      {
-	int temp = values[c->min];
-	values[c->min] = values[c->max];
-	values[c->max] = temp;
-      }
-    } /* for (comparators) */
+    sn_stage_sort (s, values);
 
     show_values (SN_NETWORK_INPUT_NUM (network), values);
   } /* for (stages) */