Merge master.

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 4975146ec87a998e5c6fa2ccbe0f3a8e6103e1c5..4334fd446ce99ae7dad7665fc4dc471072f2903c 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -493,7 +493,7 @@ KDMDialog::write_to () const
 dcp::Formulation
 KDMDialog::formulation () const
 {
-       return (dcp::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
+       return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
 }
 
 void