--- /usr/share/sdcc/include/pic16/signal.h	2005-10-06 05:51:20.000000000 -0400
+++ signal2.h	2005-10-31 02:01:45.000000000 -0500
@@ -25,47 +25,47 @@
 #ifndef __SIGNAL_H__
 #define __SIGNAL_H__
 
-#define RBIF    0x0
-#define INT0IF  0x1
-#define TMR0IF  0x2
-
-#define INT1IF  0x0
-#define INT2IF  0x1
-
-#define TMR1IF  0x0
-#define TMR2IF  0x1
-#define CCP1IF  0x2
-#define SSPIF   0x3
-#define TXIF    0x4
-#define RCIF    0x5
-#define ADIF    0x6
-#define PSPIF   0x7
-
-#define CCP2IF  0x0
-#define TMR3IF  0x1
-#define LVDIF   0x2
-#define BCLIF   0x3
-#define EEIF    0x4
+#define SRBIF    0x0
+#define SINT0IF  0x1
+#define STMR0IF  0x2
+
+#define SINT1IF  0x0
+#define SINT2IF  0x1
+
+#define STMR1IF  0x0
+#define STMR2IF  0x1
+#define SCCP1IF  0x2
+#define SSSPIF   0x3
+#define STXIF    0x4
+#define SRCIF    0x5
+#define SADIF    0x6
+#define SPSPIF   0x7
+
+#define SCCP2IF  0x0
+#define STMR3IF  0x1
+#define SLVDIF   0x2
+#define SBCLIF   0x3
+#define SEEIF    0x4
 
 /* interrupt testing arguments */
-#define SIG_RB          _INTCON, RBIF
-#define SIG_INT0        _INTCON, INT0IF
-#define SIG_INT1        _INTCON3, INT1IF
-#define SIG_INT2        _INTCON3, INT2IF
-#define SIG_CCP1        _PIR1, CCP1IF
-#define SIG_CCP2        _PIR2, CCP2IF
-#define SIG_TMR0        _INTCON, TMR0IF
-#define SIG_TMR1        _PIR1, TMR1IF
-#define SIG_TMR2        _PIR1, TMR2IF
-#define SIG_TMR3        _PIR2, TMR3IF
-#define SIG_EE          _PIR2, EEIF
-#define SIG_BCOL        _PIR2, BCLIF
-#define SIG_LVD         _PIR2, LVDIF
-#define SIG_PSP         _PIR1, PSPIF
-#define SIG_AD          _PIR1, ADIF
-#define SIG_RC          _PIR1, RCIF
-#define SIG_TX          _PIR1, TXIF
-#define SIG_MSSP        _PIR1, SSPIF
+#define SIG_RB          _INTCON, SRBIF
+#define SIG_INT0        _INTCON, SINT0IF
+#define SIG_INT1        _INTCON3, SINT1IF
+#define SIG_INT2        _INTCON3, SINT2IF
+#define SIG_CCP1        _PIR1, SCCP1IF
+#define SIG_CCP2        _PIR2, SCCP2IF
+#define SIG_TMR0        _INTCON, STMR0IF
+#define SIG_TMR1        _PIR1, STMR1IF
+#define SIG_TMR2        _PIR1, STMR2IF
+#define SIG_TMR3        _PIR2, STMR3IF
+#define SIG_EE          _PIR2, SEEIF
+#define SIG_BCOL        _PIR2, SBCLIF
+#define SIG_LVD         _PIR2, SLVDIF
+#define SIG_PSP         _PIR1, SPSPIF
+#define SIG_AD          _PIR1, SADIF
+#define SIG_RC          _PIR1, SRCIF
+#define SIG_TX          _PIR1, STXIF
+#define SIG_MSSP        _PIR1, SSSPIF
 
 
 #define DEF_ABSVECTOR(vecno, name)      \