[NaCl SDK] nacl_io: fix warning of macro redefinition on Windows.

native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc

Index: native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc
diff --git a/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc b/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc
index 0822028089b35ca2c1b4565a1a922c618410830b..95699256aefa0b9a6119d2f3ac3ba2a471709fa6 100644
--- a/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc
+++ b/native_client_sdk/src/libraries/nacl_io_test/pepper_interface_mock.cc
@@ -9,12 +9,12 @@ PepperInterfaceMock::PepperInterfaceMock(PP_Instance instance)
     : instance_(instance),
 
     // Initialize interfaces.
+#include "nacl_io/pepper/undef_macros.h"
 #include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     BaseClass##interface_(new BaseClass##Mock),
 #include "nacl_io/pepper/all_interfaces.h"
-#include "nacl_io/pepper/undef_macros.h"
 
     // Dummy value so we can ensure that no interface ends the initializer list.
     dummy_(0) {
@@ -23,12 +23,12 @@ PepperInterfaceMock::PepperInterfaceMock(PP_Instance instance)
 PepperInterfaceMock::~PepperInterfaceMock() {
 
   // Delete interfaces.
+#include "nacl_io/pepper/undef_macros.h"
 #include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
     delete BaseClass##interface_;
 #include "nacl_io/pepper/all_interfaces.h"
-#include "nacl_io/pepper/undef_macros.h"
 
 }
 
@@ -37,6 +37,7 @@ PP_Instance PepperInterfaceMock::GetInstance() {
 }
 
 // Define Getter functions, constructors, destructors.
+#include "nacl_io/pepper/undef_macros.h"
 #include "nacl_io/pepper/define_empty_macros.h"
 #undef BEGIN_INTERFACE
 #define BEGIN_INTERFACE(BaseClass, PPInterface, InterfaceString) \
@@ -48,4 +49,3 @@ PP_Instance PepperInterfaceMock::GetInstance() {
     BaseClass##Mock::~BaseClass##Mock() { \
     }
 #include "nacl_io/pepper/all_interfaces.h"
-#include "nacl_io/pepper/undef_macros.h"