DWORD -> uint32_t

3 files changed, 9 insertions, 9 deletions

diff --git a/plugins/MirOTR/Libgpg-error/estream.c b/plugins/MirOTR/Libgpg-error/estream.c
index f4bda2a1c0..0ec22a0ba0 100644
--- a/plugins/MirOTR/Libgpg-error/estream.c
+++ b/plugins/MirOTR/Libgpg-error/estream.c
@@ -263,7 +263,7 @@ mem_free (void *p)
 
 #ifdef HAVE_W32_SYSTEM
 static int
-map_w32_to_errno (DWORD w32_err)
+map_w32_to_errno (uint32_t w32_err)
 {
   switch (w32_err)
     {
@@ -1075,7 +1075,7 @@ es_func_w32_read (void *cookie, void *buffer, size_t size)
         pre_syscall_func ();
       do
         {
-          DWORD nread, ec;
+          uint32_t nread, ec;
 
           if (!ReadFile (w32_cookie->hd, buffer, size, &nread, NULL))
             {
@@ -1117,7 +1117,7 @@ es_func_w32_write (void *cookie, const void *buffer, size_t size)
         pre_syscall_func ();
       do
         {
-          DWORD nwritten;
+          uint32_t nwritten;
 
 	  if (!WriteFile (w32_cookie->hd, buffer, size, &nwritten, NULL))
 	    {
@@ -1140,7 +1140,7 @@ static int
 es_func_w32_seek (void *cookie, gpgrt_off_t *offset, int whence)
 {
   estream_cookie_w32_t w32_cookie = cookie;
-  DWORD method;
+  uint32_t method;
   LARGE_INTEGER distance, newoff;
 
   if (w32_cookie->hd == INVALID_HANDLE_VALUE)
diff --git a/plugins/MirOTR/Libgpg-error/init.c b/plugins/MirOTR/Libgpg-error/init.c
index 6305fe31af..4f3ca57af8 100644
--- a/plugins/MirOTR/Libgpg-error/init.c
+++ b/plugins/MirOTR/Libgpg-error/init.c
@@ -433,7 +433,7 @@ _gpg_err_set_errno (int err)
 /* Entry point called by the DLL loader.  */
 #ifdef DLL_EXPORT
 int WINAPI
-DllMain (HINSTANCE hinst, DWORD reason, LPVOID reserved)
+DllMain (HINSTANCE hinst, uint32_t reason, LPVOID reserved)
 {
   struct tls_space_s *tls;
   (void)reserved;
diff --git a/plugins/MirOTR/Libgpg-error/w32-gettext.c b/plugins/MirOTR/Libgpg-error/w32-gettext.c
index 89f505d91d..e52e3aee82 100644
--- a/plugins/MirOTR/Libgpg-error/w32-gettext.c
+++ b/plugins/MirOTR/Libgpg-error/w32-gettext.c
@@ -58,9 +58,9 @@
 static wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen);
 
 static HANDLE
-MyCreateFileA (LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwSharedMode,
+MyCreateFileA (LPCSTR lpFileName, uint32_t dwDesiredAccess, uint32_t dwSharedMode,
 	     LPSECURITY_ATTRIBUTES lpSecurityAttributes,
-	     DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes,
+	     uint32_t dwCreationDisposition, uint32_t dwFlagsAndAttributes,
 	     HANDLE hTemplateFile)
 {
   wchar_t *filename;
@@ -1230,7 +1230,7 @@ static struct loaded_domain *
 load_domain (const char *filename)
 {
   HANDLE fh;
-  DWORD size;
+  uint32_t size;
   struct mo_file_header *data = NULL;
   struct loaded_domain *domain = NULL;
   size_t to_read;
@@ -1260,7 +1260,7 @@ load_domain (const char *filename)
   do
     {
       BOOL res;
-      DWORD nb;
+      uint32_t nb;
 
       res = ReadFile (fh, read_ptr, to_read, &nb, NULL);
       if (! res || nb < to_read)