Index: sources/src/global_functions.cc
===================================================================
--- sources/src/global_functions.cc	(revision 31)
+++ sources/src/global_functions.cc	(revision 32)
@@ -240,5 +240,5 @@
 internal_sc_initialize (void) 
 {
-	sort_equi_list ();
+  sort_equi_list ();
 
   check_all_method_process ();
@@ -261,7 +261,8 @@
     cerr << endl;
   }
+
   // Init variables to be able to run combinational functions
 #ifdef CONFIG_CHECK_FSM_RULES
-	casc_fsm_step = STIMULI;
+  casc_fsm_step = STIMULI;
 #endif
 
@@ -274,8 +275,8 @@
     pending_write_vector = NULL;
   else
-		pending_write_vector = (pending_write_vector_t) realloc (pending_write_vector, sizeof (pending_write) * pending_write_vector_capacity);
+    pending_write_vector = (pending_write_vector_t) realloc (pending_write_vector, sizeof (pending_write_t) * pending_write_vector_capacity);
 	
   // create the clock list
-	clock_list_t clock_list;
+  clock_list_t clock_list;
   create_clock_list (clock_list, get_equi_list ());
   if (dump_netlist_info)
@@ -291,6 +292,6 @@
   }
 
-	// Check if any constructor wrote into registers
-	if (pending_write_vector_nb != 0)
+  // Check if any constructor wrote into registers
+  if (pending_write_vector_nb != 0)
 	{
 		cerr << "Error : Register/Signal writing is not allowed before sc_initialize.\n"
@@ -308,10 +309,12 @@
     use_static_func ();
   
-	pending_write_vector_nb = 0;
+  pending_write_vector_nb = 0;
  
   check_all_ports ();
   usage.start ();
+
   if (dump_stage)
     cerr << "sc_initialize () done.\n";
+
   already_initialized = true;
 }
@@ -323,5 +326,5 @@
   if (already_initialized == false) {
 #if defined(SYSTEMC_VERSION_1_0)
-		std::cerr << "Warning : call sc_initialize before executiong simulation.\n";
+    std::cerr << "Warning : call sc_initialize before executiong simulation.\n";
 #endif
     internal_sc_initialize ();
@@ -332,5 +335,5 @@
       exit (0);
     }
-	}
+  }
 }
 
@@ -366,10 +369,10 @@
 sc_start(double d_val)
 {
-	sc_cycle (d_val);
+  sc_cycle (d_val);
 #ifdef DUMP_SIGNAL_STATS
-	print_registers_writing_stats (cerr);
+  print_registers_writing_stats (cerr);
 #endif
 #ifdef DUMP_SCHEDULE_STATS
-	print_schedule_stats (cerr);
+  print_schedule_stats (cerr);
 #endif
 }
@@ -378,10 +381,10 @@
 sc_start()
 {
-	sc_cycle (-1);
+  sc_cycle (-1);
 #ifdef DUMP_SIGNAL_STATS
-	print_registers_writing_stats (cerr);
+  print_registers_writing_stats (cerr);
 #endif
 #ifdef DUMP_SCHEDULE_STATS
-	print_schedule_stats (cerr);
+  print_schedule_stats (cerr);
 #endif
 }
@@ -397,10 +400,10 @@
 sc_start( const sc_time& duration )
 {
-	sc_cycle ((double)duration);
+  sc_cycle ((double)duration);
 #ifdef DUMP_SIGNAL_STATS
-	print_registers_writing_stats (cerr);
+  print_registers_writing_stats (cerr);
 #endif
 #ifdef DUMP_SCHEDULE_STATS
-	print_schedule_stats (cerr);
+  print_schedule_stats (cerr);
 #endif
 }
Index: sources/src/sc_signal.h
===================================================================
--- sources/src/sc_signal.h	(revision 31)
+++ sources/src/sc_signal.h	(revision 32)
@@ -53,10 +53,10 @@
 extern void bind (sc_port_base   &x);
 typedef tab_t base_type;
-struct pending_write {
+struct pending_write_t {
 	base_type   *pointer;
 	base_type    value;
-	//pending_write (base_type *const pointer_, const base_type value_)
+	//pending_write_t (base_type *const pointer_, const base_type value_)
 	//{	pointer = pointer_; value = value_; }
-	friend std::ostream& operator << (std::ostream &o, const pending_write &p)
+	friend std::ostream& operator << (std::ostream &o, const pending_write_t &p)
 	{ return o << "(pointer = " << p.pointer << "; value = " << p.value << ")\n"; }
 };
@@ -67,5 +67,5 @@
 
 // Pending write to register (simple stack)
-typedef pending_write *pending_write_vector_t;
+typedef pending_write_t *pending_write_vector_t;
 extern pending_write_vector_t pending_write_vector;
 extern "C" unsigned int pending_write_vector_nb;
@@ -96,12 +96,12 @@
   if (sizeof (T) > sizeof (base_type)) {
 #if 0
-  std::cout << "sizeof (T) = " << sizeof (T) 
+    std::cout << "sizeof (T) = " << sizeof (T) 
             << " (base_type = " << sizeof (base_type) << "\n";
 #endif
-  post_multiwrite (pointer_,value_);
+    post_multiwrite (pointer_,value_);
   } else {
 #if defined(CONFIG_DEBUG)
     if (pending_write_vector_nb >= pending_write_vector_capacity) {
-      //if (pending_write_vector_nb >= pending_write_vector_capacity * sizeof(pending_write)) {
+      //if (pending_write_vector_nb >= pending_write_vector_capacity * sizeof(pending_write_t)) {
       std::cerr << "Error : The array for posted writing on register is too small.\n";
       std::cerr << "Up to 1 writing per register is allowed during a cycle.\n";
Index: sources/src/sc_trace.cc
===================================================================
--- sources/src/sc_trace.cc	(revision 31)
+++ sources/src/sc_trace.cc	(revision 32)
@@ -300,6 +300,6 @@
     return (*pointer_saved != *pointer_current);
   } else if (bit_size > 16) {
-    const uint32 *const pointer_saved   = s2t.pointer;
-    const uint32 *const pointer_current = s2t.inter->get_pointer ();
+    const uint32 *const pointer_saved   = (const uint32*)s2t.pointer;
+    const uint32 *const pointer_current = (const uint32*)s2t.inter->get_pointer ();
     return (*pointer_saved != *pointer_current);
   } else {