builds on windows again.

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@75 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/isdn/Q931.c b/libs/freetdm/src/isdn/Q931.c
index 01966b389eed65e9a9d1f5fe901a4e4ba298bea3..ac22d79d25835af03d7a5208de839acb04474067 100644 (file)
--- a/libs/freetdm/src/isdn/Q931.c
+++ b/libs/freetdm/src/isdn/Q931.c
@@ -96,7 +96,7 @@ L3INT (*Q931Tx32Proc)(Q931_TrunkInfo *pTrunk,L3UCHAR *,L3INT);
                                                                        /* callback ptr for messages to be send */\r
                                     /* to layer 2.                          */\r
 \r
-void (*Q931ErrorProc)(Q931_TrunkInfo *pTrunk, L3INT,L3INT,L3INT); \r
+L3INT (*Q931ErrorProc)(Q931_TrunkInfo *pTrunk, L3INT,L3INT,L3INT); \r
                                                                        /* callback for error messages.         */\r
 \r
 L3ULONG (*Q931GetTimeProc) ()=NULL; /* callback for func reading time in ms */\r
@@ -210,8 +210,9 @@ L3INT Q931TxDummy(Q931_TrunkInfo *pTrunk, L3UCHAR * b, L3INT n)
   Description:  Dummy function for error processing\r
 \r
 *****************************************************************************/\r
-void Q931ErrorDummy(Q931_TrunkInfo *pTrunk,L3INT a, L3INT b, L3INT c)\r
+L3INT Q931ErrorDummy(Q931_TrunkInfo *pTrunk,L3INT a, L3INT b, L3INT c)\r
 {\r
+       return 0;\r
 }\r
 \r
 /*****************************************************************************\r

diff --git a/libs/freetdm/src/isdn/Q931ie.c b/libs/freetdm/src/isdn/Q931ie.c
index d9cddbb16d8d8ffd27463b589906216869d1afb2..28b1845ca7108ef5fcccdff014af12727279009a 100644 (file)
--- a/libs/freetdm/src/isdn/Q931ie.c
+++ b/libs/freetdm/src/isdn/Q931ie.c
@@ -1310,6 +1310,8 @@ L3USHORT Q931Uie_CRV(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
     else\r
     {\r
                /* Long CRV is not used, so we skip this */\r
+               /* TODO: is it right to set to 0 here? */\r
+               CRV = 0;\r
         Octet+=l;\r
     }\r
 \r

diff --git a/libs/freetdm/src/isdn/include/Q931.h b/libs/freetdm/src/isdn/include/Q931.h
index f320504e6a7e8a1c13047cfc9a1152f7a243a20d..663d18d2da7268707f27d84a6bfbeae92c828b4c 100644 (file)
--- a/libs/freetdm/src/isdn/include/Q931.h
+++ b/libs/freetdm/src/isdn/include/Q931.h
@@ -117,7 +117,7 @@
 /* warning C4189 : local variable is initialized but not referenced  TODO:  This one should not be disabled */\r
 /* warning C4554: '&' : check operator precedence for possible error; use parentheses to clarify precedence TODO:  This one should not be disabled */\r
 /* warning C4267: '=' : conversion from 'size_t' to 'unsigned char', possible loss of data TODO:  This one should not be disabled */\r
-#pragma warning(disable:4244 4189 4554 4267)\r
+#pragma warning(disable:4100 4244 4189 4554 4267)\r
 #endif\r
 \r
 /*****************************************************************************\r