Switch to standard integer types in courgette/.

courgette/third_party/bsdiff.h

 /*-
  * Copyright 2003,2004 Colin Percival
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted providing that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 19 matching lines @@
  * 2009-03-31 - Change to use Streams.  Move CRC code to crc.{h,cc}
  *              Changed status to an enum, removed unused status codes.
  *                --Stephen Adams <sra@chromium.org>
  * 2013-04-10 - Added wrapper to apply a patch directly to files.
  *                --Joshua Pawlicki <waffles@chromium.org>
  */
 
 #ifndef COURGETTE_BSDIFF_H_
 #define COURGETTE_BSDIFF_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/files/file_util.h"
 
 namespace courgette {
 
 enum BSDiffStatus {
   OK = 0,
   MEM_ERROR = 1,
   CRC_ERROR = 2,
   READ_ERROR = 3,
   UNEXPECTED_ERROR = 4,
@@ skipping 21 matching lines @@
 BSDiffStatus ApplyBinaryPatch(const base::FilePath& old_stream,
                               const base::FilePath& patch_stream,
                               const base::FilePath& new_stream);
 
 // The following declarations are common to the patch-creation and
 // patch-application code.
 
 // The patch stream starts with a MBSPatchHeader.
 typedef struct MBSPatchHeader_ {
   char tag[8];       // Contains MBS_PATCH_HEADER_TAG
-  uint32 slen;       // Length of the file to be patched.
-  uint32 scrc32;     // CRC32 of the file to be patched.
-  uint32 dlen;       // Length of the result file.
+  uint32_t slen;     // Length of the file to be patched.
+  uint32_t scrc32;   // CRC32 of the file to be patched.
+  uint32_t dlen;     // Length of the result file.
 } MBSPatchHeader;
 
 // This is the value for the tag field.  Must match length exactly, not counting
 // null at end of string.
 #define MBS_PATCH_HEADER_TAG "GBSDIF42"
 
 }  // namespace
 #endif  // COURGETTE_BSDIFF_H_