Removed obsolete INT_Int31Handler.

dlls/kernel/kernel32.spec

@@ -1055,7 +1055,6 @@
 @ stdcall INT_Int25Handler(ptr) INT_Int25Handler
 @ stdcall INT_Int26Handler(ptr) INT_Int26Handler  
 @ stdcall INT_Int2fHandler(ptr) INT_Int2fHandler
-@ stdcall INT_Int31Handler(ptr) INT_Int31Handler
 @ stdcall NetBIOSCall16(ptr) NetBIOSCall16
 @ cdecl INT_SetPMHandler(long long) INT_SetPMHandler
 @ cdecl LOCAL_Alloc(long long long) LOCAL_Alloc

dlls/kernel/wprocs.spec

@@ -8,7 +8,6 @@
 137 pascal -register  INT_Int25Handler() INT_Int25Handler
 138 pascal -register  INT_Int26Handler() INT_Int26Handler
 147 pascal -interrupt INT_Int2fHandler() INT_Int2fHandler
-149 pascal -interrupt INT_Int31Handler() INT_Int31Handler
 192 pascal -interrupt INT_Int5cHandler() NetBIOSCall16
 # default handler for unimplemented interrupts
 356 pascal -interrupt INT_DefaultHandler() INT_DefaultHandler

dlls/winedos/dosaspi.c

@@ -24,6 +24,7 @@
 #include "wine/winaspi.h"
 #include "wine/debug.h"
 #include "miscemu.h" /* DOSMEM_* */
+#include "dosexe.h"
 #include "winerror.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(aspi);

dlls/winedos/dosexe.h

@@ -138,8 +138,12 @@ extern void WINAPI DOSVM_Int29Handler(CONTEXT86*);
 extern void WINAPI DOSVM_Int2aHandler(CONTEXT86*);
 
 /* int31.c */
+typedef void (WINAPI *RMCBPROC)(CONTEXT86*);
 extern void WINAPI DOSVM_Int31Handler(CONTEXT86*);
 extern BOOL DOSVM_IsDos32(void);
+extern FARPROC16 WINAPI DPMI_AllocInternalRMCB(RMCBPROC);
+extern void WINAPI DPMI_FreeInternalRMCB(FARPROC16);
+extern int DPMI_CallRMProc(CONTEXT86*,LPWORD,int,int);
 
 /* int33.c */
 extern void WINAPI DOSVM_Int33Handler(CONTEXT86*);

include/callback.h

@@ -29,13 +29,6 @@ typedef struct {
     void (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum );
     void (WINAPI *CallBuiltinHandler)( CONTEXT86 *context, BYTE intnum );
 
-    /* DPMI functions */
-    void (WINAPI *CallRMInt)( CONTEXT86 *context );
-    void (WINAPI *CallRMProc)( CONTEXT86 *context, int iret );
-    void (WINAPI *AllocRMCB)( CONTEXT86 *context );
-    void (WINAPI *FreeRMCB)( CONTEXT86 *context );
-    void (WINAPI *RawModeSwitch)( CONTEXT86 *context );
-
     /* I/O functions */
     void (WINAPI *SetTimer)( unsigned ticks );
     unsigned (WINAPI *GetTimer)( void );

include/miscemu.h

@@ -263,12 +263,7 @@ extern void WINAPI INT_Int3dHandler(CONTEXT86*);
 extern void WINAPI INT_Int3eHandler(CONTEXT86*);
 
 /* msdos/dpmi.c */
-typedef void (WINAPI *RMCBPROC)(CONTEXT86*);
-extern void WINAPI INT_Int31Handler(CONTEXT86*);
 extern BOOL DPMI_LoadDosSystem(void);
-extern FARPROC16 WINAPI DPMI_AllocInternalRMCB(RMCBPROC);
-extern void WINAPI DPMI_FreeInternalRMCB(FARPROC16);
-extern int DPMI_CallRMProc(CONTEXT86*,LPWORD,int,int);
 
 /* misc/ppdev.c */