Browse Source

strgrp: Optionally include OpenMP pragma

Andrew Jeffery 10 years ago
parent
commit
9722c4a494
2 changed files with 11 additions and 0 deletions
  1. 7 0
      ccan/strgrp/_info
  2. 4 0
      ccan/strgrp/strgrp.c

+ 7 - 0
ccan/strgrp/_info

@@ -103,5 +103,12 @@ int main(int argc, char *argv[]) {
         return 0;
         return 0;
     }
     }
 
 
+#if HAVE_OPENMP
+    if (strcmp(argv[1], "cflags") == 0) {
+        printf("-fopenmp\n");
+        return 0;
+    }
+#endif
+
     return 1;
     return 1;
 }
 }

+ 4 - 0
ccan/strgrp/strgrp.c

@@ -25,6 +25,7 @@
 #include "ccan/tal/tal.h"
 #include "ccan/tal/tal.h"
 #include "ccan/tal/str/str.h"
 #include "ccan/tal/str/str.h"
 #include "strgrp.h"
 #include "strgrp.h"
+#include "config.h"
 
 
 typedef darray(struct strgrp_grp *) darray_grp;
 typedef darray(struct strgrp_grp *) darray_grp;
 typedef darray(struct strgrp_item *) darray_item;
 typedef darray(struct strgrp_item *) darray_item;
@@ -224,7 +225,10 @@ grp_for(struct strgrp *const ctx, const char *const str) {
         }
         }
     }
     }
     int i;
     int i;
+// Keep ccanlint happy in reduced feature mode
+#if HAVE_OPENMP
     #pragma omp parallel for schedule(dynamic)
     #pragma omp parallel for schedule(dynamic)
+#endif
     for (i = 0; i < ctx->n_grps; i++) {
     for (i = 0; i < ctx->n_grps; i++) {
         ctx->scores[i].grp = darray_item(ctx->grps, i);
         ctx->scores[i].grp = darray_item(ctx->grps, i);
         const bool ss = should_grp_score(ctx, ctx->scores[i].grp, str);
         const bool ss = should_grp_score(ctx, ctx->scores[i].grp, str);