***************
*** 311,320 ****
  			    char *name, int numArgs, Mp_ValueType *argTypes,
  			    Mp_MathProc *proc, ClientData clientData));
  static void             ExprFreeMathArgs _ANSI_ARGS_ ((Mp_Value *args));
- /* EFP */
- static int		ExprTertiaryZFunc _ANSI_ARGS_((ClientData clientData,
-                                            Tcl_Interp *interp, Mp_Value *args,
-                                            Mp_Value *resultPtr));
  
  
  /*
--- 311,316 ----
  			    char *name, int numArgs, Mp_ValueType *argTypes,
  			    Mp_MathProc *proc, ClientData clientData));
  static void             ExprFreeMathArgs _ANSI_ARGS_ ((Mp_Value *args));
  
  
  /*
***************
*** 401,408 ****
      {"comb", 2, {MP_INT, MP_INT}, (Mp_MathProc *)ExprBinaryZFunc, (ClientData) zcomb},
      {"prime", 2, {MP_INT, MP_INT}, (Mp_MathProc *)ExprBinaryZFunc, (ClientData) Zprimetest},
      {"relprime", 2, {MP_INT, MP_INT}, (Mp_MathProc *)ExprBinaryZFunc, (ClientData) Zrelprime},
!     /* EFP */
!     {"pmod", 3, {MP_INT,MP_INT,MP_INT}, (Mp_MathProc *)ExprTertiaryZFunc, (ClientData) zpowermod},
      {0},
  };
  
--- 397,403 ----
      {"comb", 2, {MP_INT, MP_INT}, (Mp_MathProc *)ExprBinaryZFunc, (ClientData) zcomb},
      {"prime", 2, {MP_INT, MP_INT}, (Mp_MathProc *)ExprBinaryZFunc, (ClientData) Zprimetest},
      {"relprime", 2, {MP_INT, MP_INT}, (Mp_MathProc *)ExprBinaryZFunc, (ClientData) Zrelprime},
! 
      {0},
  };
  
***************
*** 2365,2392 ****
      (void) (*func)(args[0].intValue, args[1].intValue, &resultPtr->intValue);
      return TCL_OK;
  }
- 
- 
- /* EFP */
- static int
- ExprTertiaryZFunc(clientData, interp, args, resultPtr)
- ClientData clientData;		/* Contains address of procedure that
-                                  * takes two int arguments and
-                                  * returns a int result. */
- Tcl_Interp *interp;
- Mp_Value *args;
- Mp_Value *resultPtr;
- {
-     void (*func) _ANSI_ARGS_((ZVALUE, ZVALUE, ZVALUE, ZVALUE *))
-     = (void (*)_ANSI_ARGS_((ZVALUE, ZVALUE, ZVALUE, ZVALUE *))) clientData;
- 
- 
-     resultPtr->type = MP_INT;
-     zfree(resultPtr->intValue);
-     (void) (*func)(args[0].intValue, args[1].intValue, args[2].intValue, &resultPtr->intValue);
-     return TCL_OK;
- }
- 
  
  	/* ARGSUSED */
  static int
--- 2360,2365 ----
      (void) (*func)(args[0].intValue, args[1].intValue, &resultPtr->intValue);
      return TCL_OK;
  }
  
  	/* ARGSUSED */
  static int