diff --git a/Python/getargs.c b/Python/getargs.c
index 34e3a5c..86fd471 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -500,11 +500,11 @@
 		}
 	
 #if HAVE_LONG_LONG
-	case 'L': /* long long */
+	case 'L': /* LONG_LONG */
 		{
-			long long *p = va_arg( *p_va, long long * );
-			long long ival = PyLong_AsLongLong( arg );
-			if( ival == (long long)-1 && PyErr_Occurred() ) {
+			LONG_LONG *p = va_arg( *p_va, LONG_LONG * );
+			LONG_LONG ival = PyLong_AsLongLong( arg );
+			if( ival == (LONG_LONG)-1 && PyErr_Occurred() ) {
 				return "long<L>";
 			} else {
 				*p = ival;
@@ -1003,9 +1003,9 @@
 		}
 	
 #if HAVE_LONG_LONG
-	case 'L': /* long long int */
+	case 'L': /* LONG_LONG int */
 		{
-			(void) va_arg(*p_va, long long *);
+			(void) va_arg(*p_va, LONG_LONG *);
 			break;
 		}
 #endif
diff --git a/Python/modsupport.c b/Python/modsupport.c
index 7e1acab..6066aa8 100644
--- a/Python/modsupport.c
+++ b/Python/modsupport.c
@@ -293,7 +293,7 @@
 
 #if HAVE_LONG_LONG
 		case 'L':
-			return PyLong_FromLongLong((long long)va_arg(*p_va, long long));
+			return PyLong_FromLongLong((LONG_LONG)va_arg(*p_va, LONG_LONG));
 #endif
 
 		case 'f':