diff --git a/webrtc/modules/desktop_capture/window_capturer.h b/webrtc/modules/desktop_capture/window_capturer.h
index 65b27eda07..8cc57c14d5 100644
--- a/webrtc/modules/desktop_capture/window_capturer.h
+++ b/webrtc/modules/desktop_capture/window_capturer.h
@@ -22,11 +22,7 @@ namespace webrtc {
 
 class WindowCapturer : public DesktopCapturer {
  public:
-#if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-  typedef unsigned int WindowId;
-#elif defined(WEBRTC_WIN)
-  typedef void* WindowId;
-#endif
+  typedef intptr_t WindowId;
 
   struct Window {
     WindowId id;
diff --git a/webrtc/modules/desktop_capture/window_capturer_win.cc b/webrtc/modules/desktop_capture/window_capturer_win.cc
index f9316c14d1..97d1d27cbc 100644
--- a/webrtc/modules/desktop_capture/window_capturer_win.cc
+++ b/webrtc/modules/desktop_capture/window_capturer_win.cc
@@ -64,7 +64,7 @@ BOOL CALLBACK WindowsEnumerationHandler(HWND hwnd, LPARAM param) {
     return TRUE;
 
   WindowCapturer::Window window;
-  window.id = hwnd;
+  window.id = reinterpret_cast<WindowCapturer::WindowId>(hwnd);
 
   const size_t kTitleLength = 500;
   WCHAR window_title[kTitleLength];