Addresses #1032, #1343

Fix up (some of the) windows compilation issues during merge of 1032b to main

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

toku_include/toku_portability.h

@@ -22,6 +22,10 @@ extern "C" {
 #if TOKU_WINDOWS
 // Windows
 
+#if defined(__ICL)
+#define __attribute__(x)      /* Nothing */
+#endif
+
 #include "stdint.h"
 #include "inttypes.h"
 #include <direct.h>
@@ -32,10 +36,6 @@ extern "C" {
 
 #define UNUSED_WARNING(a) a=a /* To make up for missing attributes */
 
-#if defined(__ICL)
-#define __attribute__(x)      /* Nothing */
-#endif
-
 #elif defined(__INTEL_COMPILER)
 
 #if defined(__ICC)

windows/rss.c

+#include <toku_portability.h>
 #include <windows.h>
 #include <stdint.h>
 #include <inttypes.h>