Switch to standard integer types in courgette/.

courgette/ensemble.h

Index: courgette/ensemble.h
diff --git a/courgette/ensemble.h b/courgette/ensemble.h
index e538bd6d82f31b9cfe53b037d157830e0a0de893..adb4b079c3266578f5be11eade80033f63f04e65 100644
--- a/courgette/ensemble.h
+++ b/courgette/ensemble.h
@@ -17,11 +17,13 @@
 #ifndef COURGETTE_ENSEMBLE_H_
 #define COURGETTE_ENSEMBLE_H_
 
-#include <vector>
-#include <string>
+#include <stddef.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
+#include <string>
+#include <vector>
 
+#include "base/macros.h"
 #include "courgette/courgette.h"
 #include "courgette/region.h"
 #include "courgette/streams.h"
@@ -130,9 +132,9 @@ struct CourgettePatchFile {
   //        element-2
   //        ...
 
-  static const uint32 kMagic = 'C' | ('o' << 8) | ('u' << 16);
+  static const uint32_t kMagic = 'C' | ('o' << 8) | ('u' << 16);
 
-  static const uint32 kVersion = 20110216;
+  static const uint32_t kVersion = 20110216;
 };
 
 // For any transform you would implement both a TransformationPatcher and a