Index: sources/src/casc.h
===================================================================
--- sources/src/casc.h	(revision 62)
+++ sources/src/casc.h	(revision 63)
@@ -24,5 +24,5 @@
 EXTERN char unstable;
 EXTERN int32_t * pending_write_vector_nb;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate (pending_write_vector_nb)
 #endif
Index: sources/src/dump_used_options.cc
===================================================================
--- sources/src/dump_used_options.cc	(revision 62)
+++ sources/src/dump_used_options.cc	(revision 63)
@@ -89,6 +89,6 @@
   "INIT_SIGNALS_TO_ZERO, "
 #endif
-#ifdef USE_OPENMP
-  "USE_OPENMP, "
+#ifdef _OPENMP
+  "_OPENMP, "
 #endif
   "...";
Index: sources/src/gen_code.cc
===================================================================
--- sources/src/gen_code.cc	(revision 62)
+++ sources/src/gen_code.cc	(revision 63)
@@ -49,5 +49,5 @@
 #include <iostream>
 #include <fstream>
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     #include <omp.h>
 #endif
@@ -572,5 +572,5 @@
 unsigned long long busy_wait_f0, busy_wait_f1, busy_wait_up, busy_wait_ml;
 unsigned long long last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate (nb_func, func_list)
 #pragma omp threadprivate (busy_wait_f0, busy_wait_f1, busy_wait_up,busy_wait_ml)
@@ -613,5 +613,5 @@
 unsigned int expected_globaltime = 0;
 volatile unsigned int globaltime __attribute__ ((aligned (128))) = 0;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate (expected_globaltime)
 #pragma omp shared (globaltime)
@@ -639,5 +639,5 @@
     }
 #else
-    #ifdef USE_OPENMP
+    #ifdef _OPENMP
     #pragma omp barrier
     #endif
@@ -659,10 +659,10 @@
     }
 #else
-    #ifdef USE_OPENMP
+    #ifdef _OPENMP
     #pragma omp barrier
     #endif
 #endif
     if (!quasistatic_list.empty()) {
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp master
 #endif
@@ -681,5 +681,5 @@
         }
 #else
-    #ifdef USE_OPENMP
+    #ifdef _OPENMP
     #pragma omp barrier
     #endif
Index: sources/src/gen_code.h
===================================================================
--- sources/src/gen_code.h	(revision 62)
+++ sources/src/gen_code.h	(revision 63)
@@ -21,5 +21,5 @@
 #include "process_dependency.h"
 
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     #include <omp.h>
 #endif
@@ -108,5 +108,5 @@
     extern unsigned int expected_globaltime;
     extern volatile unsigned int globaltime;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate (busy_wait_f0, busy_wait_f1, busy_wait_up, busy_wait_ml, nb_func)
 #pragma omp threadprivate (last_wait_f0, last_wait_f1, last_wait_up, last_wait_ml)
@@ -117,5 +117,5 @@
 
 
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp parallel 
 #endif
@@ -126,10 +126,10 @@
 
         expected_globaltime = 0;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp master
 #endif
         {
             globaltime = 0;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
             num_omp_threads = omp_get_num_threads();
 #else
@@ -138,10 +138,10 @@
         }
 
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp barrier
 #endif
         while (!(have_to_stop || cyclecount == 0)) {
         //while (!(have_to_stop || number_of_cycles == 0)) {
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp master
 #endif
@@ -150,5 +150,5 @@
             }
             internal_sc_cycle2();
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp master
 #endif
@@ -159,9 +159,9 @@
             // number_of_cycles = (number_of_cycles < 0) ? number_of_cycles : number_of_cycles - 1;
         }
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp barrier
 #endif
 #if 0
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp critical
         {
@@ -204,5 +204,5 @@
     if (is_posted_write()) {
         // update posted value to external signals		
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp parallel
 #endif
@@ -215,5 +215,5 @@
     // don't need to do func_combinationals since 'unstable' flag is now false
     if (is_posted_write()) {
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp parallel
 #endif
Index: sources/src/global_functions.cc
===================================================================
--- sources/src/global_functions.cc	(revision 62)
+++ sources/src/global_functions.cc	(revision 63)
@@ -248,5 +248,5 @@
     assert(pending_write_vector_capacity != 0);
 
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     #define LINE_SIZE 128L
     int malloc_size = (sizeof (pending_write_t) * (pending_write_vector_capacity + 1) + (LINE_SIZE - 1)) & ~(LINE_SIZE - 1);
Index: sources/src/sc_main.cc
===================================================================
--- sources/src/sc_main.cc	(revision 62)
+++ sources/src/sc_main.cc	(revision 63)
@@ -37,5 +37,5 @@
 #include <sstream>
 #include <list>
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     #include <omp.h>
 #endif
@@ -90,5 +90,5 @@
 bool use_port_dependency  = false;
 
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 bool use_openmp = true;
 #else
Index: sources/src/sc_module.cc
===================================================================
--- sources/src/sc_module.cc	(revision 62)
+++ sources/src/sc_module.cc	(revision 63)
@@ -38,5 +38,5 @@
 #include <vector>
 #include <set>
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     #include <omp.h>
 #endif
@@ -131,5 +131,5 @@
     module = &mod;
     dont_initialize = false;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     omp_threadnum = omp_get_thread_num();
 #endif
Index: sources/src/sc_port.cc
===================================================================
--- sources/src/sc_port.cc	(revision 62)
+++ sources/src/sc_port.cc	(revision 63)
@@ -55,5 +55,5 @@
     int32_t * pending_write_vector_nb = 0;
     unsigned long long int total_assig = 0;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate (pending_write_vector_nb, total_assig)
 #endif
@@ -69,5 +69,5 @@
 unsigned int pending_write_vector_capacity;
 pending_write_vector_t pending_write_vector = NULL;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate (pending_write_vector)
 #endif
Index: sources/src/sc_signal.h
===================================================================
--- sources/src/sc_signal.h	(revision 62)
+++ sources/src/sc_signal.h	(revision 63)
@@ -70,10 +70,10 @@
 extern "C" int32_t * pending_write_vector_nb;
 extern "C" unsigned long long int total_assig;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate(pending_write_vector_nb, total_assig)
 #endif
 extern unsigned int pending_write_vector_capacity;
 extern pending_write_vector_t pending_write_vector;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate(pending_write_vector)
 #endif
Index: sources/src/sc_time.cc
===================================================================
--- sources/src/sc_time.cc	(revision 62)
+++ sources/src/sc_time.cc	(revision 63)
@@ -55,5 +55,5 @@
 
 uint64 nb_cycles = 0;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate(nb_cycles)
 #endif
Index: sources/src/sc_time.h
===================================================================
--- sources/src/sc_time.h	(revision 62)
+++ sources/src/sc_time.h	(revision 63)
@@ -42,5 +42,5 @@
 
 extern uint64 nb_cycles;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate(nb_cycles)
 #endif
Index: sources/src/sc_ver.cc
===================================================================
--- sources/src/sc_ver.cc	(revision 62)
+++ sources/src/sc_ver.cc	(revision 63)
@@ -78,5 +78,5 @@
     "\n"
     "                           Last change : " __DATE__ "\n"
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     "            Compiled with OpenMP enabled\n"
 #endif
Index: sources/src/schedulers.cc
===================================================================
--- sources/src/schedulers.cc	(revision 62)
+++ sources/src/schedulers.cc	(revision 63)
@@ -49,5 +49,5 @@
 #include "graph_signals.h" // makegraph
 
-#ifdef USE_OPENMP
+#ifdef _OPENMP
     #include <omp.h>
 #endif
@@ -64,5 +64,5 @@
 method_process_list_t * transition_func_list;
 method_process_list_t * moore_func_list;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp threadprivate(transition_func_list, moore_func_list)
 #endif
@@ -122,5 +122,5 @@
 void sort_functions() {
     method_process_list_t::const_iterator m;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp parallel
 #pragma omp critical
@@ -130,5 +130,5 @@
         moore_func_list = new method_process_list_t;
         for (m = method_process_list.begin(); m != method_process_list.end(); ++m) {
-#ifdef USE_OPENMP
+#ifdef _OPENMP
             if ((*m)->omp_threadnum == omp_get_thread_num())
 #endif
@@ -234,5 +234,5 @@
 
     sort_functions();
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp parallel
 #pragma omp critical
@@ -240,10 +240,10 @@
     {
         if (dump_funclist_info) {
-#ifdef USE_OPENMP
+#ifdef _OPENMP
             cerr << "Thread " << omp_get_thread_num() << "\n";
 #endif
             cerr << "  Transition functions : " << *transition_func_list << "\n";
             cerr << "  Moore generation functions : " << *moore_func_list << "\n";
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp master
 #endif
@@ -295,5 +295,5 @@
                 // Doesn't use port dependancies
                 strong_component_list_t * strong_list = NULL;
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp master
 #endif
@@ -315,5 +315,5 @@
                 //    delete *i;
                 //}
-#ifdef USE_OPENMP
+#ifdef _OPENMP
 #pragma omp master
 #endif