diff -u -r ../orig/chuck-1.2.1.3/src/chuck_oo.cpp src/chuck_oo.cpp
--- ../orig/chuck-1.2.1.3/src/chuck_oo.cpp	2009-10-05 01:09:29.000000000 -0500
+++ src/chuck_oo.cpp	2009-12-28 15:49:05.000000000 -0600
@@ -1574,7 +1574,7 @@
         this->close();
     
     // try to open as a dir first
-    if (m_dir = opendir( path.c_str() ) ) {
+    if ( (m_dir = opendir( path.c_str() )) ) {
         EM_poplog();
         return TRUE;
     }
@@ -1849,7 +1849,7 @@
     rewinddir( m_dir );
     std::vector<Chuck_String *> entrylist;
     struct dirent *ent;
-    while ( ent = readdir( m_dir ) )
+    while ( (ent = readdir( m_dir )) )
     {
         Chuck_String *s = (Chuck_String *)instantiate_and_initialize_object( &t_string, NULL );
         s->str = std::string( ent->d_name );
Only in src: chuck_oo.cpp~
Only in src: chuck_oo.o
Only in src: chuck_otf.o
Only in src: chuck.output
Only in src: chuck_parse.o
Only in src: chuck_scan.o
diff -u -r ../orig/chuck-1.2.1.3/src/chuck_shell.cpp src/chuck_shell.cpp
--- ../orig/chuck-1.2.1.3/src/chuck_shell.cpp	2009-10-05 01:09:29.000000000 -0500
+++ src/chuck_shell.cpp	2009-12-28 15:07:20.000000000 -0600
@@ -1750,7 +1750,7 @@
     for( ; i < len; i++ )
     {
         vm_no = strtoul( argv[i].c_str(), NULL, 10 );
-        if( vm_no == 0 && errno == EINVAL || caller->vms.size() <= vm_no || 
+        if( (vm_no == 0 && errno == EINVAL) || caller->vms.size() <= vm_no || 
             caller->vms[vm_no] == NULL )
         {
             out += "error: invalid VM id: " + argv[i] + "\n";
Only in src: chuck_shell.cpp~
Only in src: chuck_shell.o
Only in src: chuck_stats.o
Only in src: chuck_symbol.o
Only in src: chuck.tab.c
Only in src: chuck.tab.h
Only in src: chuck_table.o
Only in src: chuck.tab.o
diff -u -r ../orig/chuck-1.2.1.3/src/chuck_type.cpp src/chuck_type.cpp
--- ../orig/chuck-1.2.1.3/src/chuck_type.cpp	2009-10-05 01:09:29.000000000 -0500
+++ src/chuck_type.cpp	2009-12-28 15:47:21.000000000 -0600
@@ -4201,9 +4201,8 @@
 //-----------------------------------------------------------------------------
 t_CKBOOL type_engine_check_primitive( Chuck_Type * type )
 {
-    return ( isa(type, &t_int) || isa(type, &t_float) || isa(type, &t_dur) ||
-             isa(type, &t_time) ) || isa(type, &t_complex) || isa(type, &t_polar)
-             && ( type->array_depth == 0 );
+    return ( isa(type, &t_int) || isa(type, &t_float) || isa(type, &t_dur) || isa(type, &t_time) ) 
+        || ( ( isa(type, &t_complex) || isa(type, &t_polar) ) && ( type->array_depth == 0 ) );
 }
 t_CKBOOL isprim( Chuck_Type * type )
 {   return type_engine_check_primitive( type ); }
Only in src: chuck_type.cpp~
diff -u -r ../orig/chuck-1.2.1.3/src/chuck_type.h src/chuck_type.h
--- ../orig/chuck-1.2.1.3/src/chuck_type.h	2009-10-05 01:09:29.000000000 -0500
+++ src/chuck_type.h	2009-12-28 15:48:05.000000000 -0600
@@ -167,7 +167,7 @@
         else if( climb > 0 )
         {
             for( t_CKUINT i = scope.size(); i > 0; i-- )
-            { if( val = (*scope[i-1])[xid] ) break; }
+	     { if( (val = (*scope[i-1])[xid]) ) break; }
 
             // look in commit buffer
             if( !val && (commit_map.find(xid) != commit_map.end()) )
Only in src: chuck_type.h~
Only in src: chuck_type.o
Only in src: chuck_ugen.o
Only in src: chuck_utils.o
diff -u -r ../orig/chuck-1.2.1.3/src/chuck_vm.cpp src/chuck_vm.cpp
--- ../orig/chuck-1.2.1.3/src/chuck_vm.cpp	2009-10-05 01:09:29.000000000 -0500
+++ src/chuck_vm.cpp	2009-12-28 15:48:15.000000000 -0600
@@ -2198,7 +2198,7 @@
     }
 
     // get current shred
-    if( temp = m_current_shred )
+    if( (temp = m_current_shred) )
         list.push_back( temp );
 
     // sort the list
diff -u -r ../orig/chuck-1.2.1.3/src/uana_extract.cpp src/uana_extract.cpp
--- ../orig/chuck-1.2.1.3/src/uana_extract.cpp	2009-10-05 01:09:29.000000000 -0500
+++ src/uana_extract.cpp	2009-12-28 14:59:29.000000000 -0600
@@ -1337,7 +1337,8 @@
 void xcorr_fft( SAMPLE * f, t_CKINT fsize, SAMPLE * g, t_CKINT gsize, SAMPLE * buffy, t_CKINT size )
 {
     // sanity check
-    assert( fsize == gsize == size );
+    assert( fsize == size );
+    assert( gsize == size );
 
     // take fft
     rfft( f, size/2, FFT_FORWARD );
diff -u -r ../orig/chuck-1.2.1.3/src/ugen_stk.cpp src/ugen_stk.cpp
--- ../orig/chuck-1.2.1.3/src/ugen_stk.cpp	2009-10-05 01:09:29.000000000 -0500
+++ src/ugen_stk.cpp	2009-12-28 14:57:37.000000000 -0600
@@ -15461,8 +15461,9 @@
     envelope.setTarget( norm * 2.0 );
   else if (number == __SK_Breath_) // 2
     blowFreqMod = norm * 0.5;
-  else if (number == __SK_Sustain_)  // 64
+  else if (number == __SK_Sustain_) {  // 64
       if (value < 1.0) subSample = 1;
+  }
   else
     std::cerr << "[chuck](via STK): Whistle: Undefined Control Number (" << number << ")!!" << std::endl;
 
diff -u -r ../orig/chuck-1.2.1.3/src/util_hid.cpp src/util_hid.cpp
--- ../orig/chuck-1.2.1.3/src/util_hid.cpp	2009-10-05 01:09:29.000000000 -0500
+++ src/util_hid.cpp	2009-12-28 15:49:40.000000000 -0600
@@ -6887,7 +6887,7 @@
         return;
     }
     
-    while( dir_entity = readdir( dir_handle ) )
+    while( (dir_entity = readdir( dir_handle )) )
     {
         if( sscanf( dir_entity->d_name, CK_HID_JOYSTICKFILE, &js_num ) )
         {
@@ -7084,7 +7084,7 @@
         return;
     }
     
-    while( dir_entity = readdir( dir_handle ) )
+    while( (dir_entity = readdir( dir_handle )) )
     {
         if( sscanf( dir_entity->d_name, CK_HID_EVDEVFILE, &m_num ) )
         {
@@ -7280,7 +7280,7 @@
         return;
     }
     
-    while( dir_entity = readdir( dir_handle ) )
+    while( (dir_entity = readdir( dir_handle )) )
     {
         if( sscanf( dir_entity->d_name, CK_HID_EVDEVFILE, &m_num ) )
         {