Merged windows compile error fix from #1510

git-svn-id: file:///svn/toku/tokudb@10346 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/block_table.c

@@ -336,13 +336,6 @@ toku_block_dump_translation(BLOCK_TABLE bt, u_int64_t offset) {
     unlock_for_blocktable(bt);
 }
 
-void
-toku_block_recovery_set_unused_blocks(BLOCK_TABLE bt, BLOCKNUM newunused) {
-    lock_for_blocktable(bt);
-    bt->unused_blocks = newunused;
-    unlock_for_blocktable(bt);
-}
-
 void
 toku_block_memcpy_translation_table(BLOCK_TABLE bt, size_t n, void *p) {
     lock_for_blocktable(bt);

newbrt/brt.c

@@ -2704,6 +2704,9 @@ static int brt_init_header(BRT t) {
         } else {
             lh.u.one.root = t->h->roots[0];
         }
+#ifdef __ICL
+        lh = lh; //Satisfy icl (variable set but unused)
+#endif
         //if ((r=toku_log_fheader(toku_txn_logger(txn), (LSN*)0, 0, toku_txn_get_txnid(txn), toku_cachefile_filenum(t->cf), lh))) { return r; }
     }
     if ((r=setup_initial_brt_root_node(t, root))!=0) { return r; }

newbrt/recover.c

@@ -242,7 +242,7 @@ toku_recover_enqrootentry (LSN lsn __attribute__((__unused__)), FILENUM filenum,
     
     struct brt_cmd cmd;
     DBT keydbt, valdbt;
-    cmd.type=typ;
+    cmd.type=(enum brt_cmd_type) typ;
     cmd.xid =xid;
     cmd.u.id.key = toku_fill_dbt(&keydbt, key.data, key.len);
     cmd.u.id.val = toku_fill_dbt(&valdbt, val.data, val.len);