[asterisk-commits] pcadach: branch pcadach/chan_h323-live r42928 - /team/pcadach/chan_h323-live/...

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Thu Sep 14 08:24:20 2006
New Revision: 42928

URL: http://svn.digium.com/view/asterisk?rev=42928&view=rev
Log:
Remove OpenH323/PWLib version extraction - it's totally invalid, use defined constants instead

Modified:
    team/pcadach/chan_h323-live/channels/h323/Makefile
    team/pcadach/chan_h323-live/channels/h323/Makefile.in
    team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp
    team/pcadach/chan_h323-live/channels/h323/compat_h323.h

Modified: team/pcadach/chan_h323-live/channels/h323/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/Makefile?rev=42928&r1=42927&r2=42928&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile Thu Sep 14 08:24:20 2006
@@ -26,16 +26,6 @@
 
 include $(OPENH323DIR)/openh323u.mak
 
-PWLIB_MAJOR=$(shell cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
-PWLIB_MINOR=$(shell cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
-PWLIB_BUILD=$(shell cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
-STDCCFLAGS += -D_PWLIB_VERSION=${PWLIB_MAJOR}*10000+${PWLIB_MINOR}*100+${PWLIB_BUILD}
-
-OPENH323_MAJOR=$(shell cat ${OPENH323DIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
-OPENH323_MINOR=$(shell cat ${OPENH323DIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
-OPENH323_BUILD=$(shell cat ${OPENH323DIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
-STDCCFLAGS += -D_OPENH323_VERSION=${OPENH323_MAJOR}*10000+${OPENH323_MINOR}*100+${OPENH323_BUILD}
-
 notrace::
 	$(MAKE) NOTRACE=1 opt
 

Modified: team/pcadach/chan_h323-live/channels/h323/Makefile.in
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/Makefile.in?rev=42928&r1=42927&r2=42928&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/Makefile.in (original)
+++ team/pcadach/chan_h323-live/channels/h323/Makefile.in Thu Sep 14 08:24:20 2006
@@ -26,16 +26,6 @@
 
 include $(OPENH323DIR)/openh323u.mak
 
-PWLIB_MAJOR=$(shell cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
-PWLIB_MINOR=$(shell cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
-PWLIB_BUILD=$(shell cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
-STDCCFLAGS += -D_PWLIB_VERSION=${PWLIB_MAJOR}*10000+${PWLIB_MINOR}*100+${PWLIB_BUILD}
-
-OPENH323_MAJOR=$(shell cat ${OH323_INCDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' ')
-OPENH323_MINOR=$(shell cat ${OH323_INCDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' ')
-OPENH323_BUILD=$(shell cat ${OH323_INCDIR}/version.h | grep BUILD_NUMBER  | cut -f3 -d' ')
-STDCCFLAGS += -D_OPENH323_VERSION=${OPENH323_MAJOR}*10000+${OPENH323_MINOR}*100+${OPENH323_BUILD}
-
 notrace::
 	$(MAKE) NOTRACE=1 opt
 

Modified: team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp?rev=42928&r1=42927&r2=42928&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp (original)
+++ team/pcadach/chan_h323-live/channels/h323/compat_h323.cpp Thu Sep 14 08:24:20 2006
@@ -34,7 +34,7 @@
 
 #include "ast_h323.h"
 
-#if _OPENH323_VERSION < VERSION(1,17,3)
+#if VERSION(OPENH323_MAJOR,OPENH323_MINOR,OPENH323_BUILD) < VERSION(1,17,3)
 MyH323TransportTCP::MyH323TransportTCP(
 				H323EndPoint & endpoint,
 				PIPSocket::Address binding,

Modified: team/pcadach/chan_h323-live/channels/h323/compat_h323.h
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/h323/compat_h323.h?rev=42928&r1=42927&r2=42928&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/h323/compat_h323.h (original)
+++ team/pcadach/chan_h323-live/channels/h323/compat_h323.h Thu Sep 14 08:24:20 2006
@@ -1,7 +1,7 @@
 #ifndef COMPAT_H323_H
 #define COMPAT_H323_H
 
-#if _OPENH323_VERSION < VERSION(1,17,3)
+#if VERSION(OPENH323_MAJOR,OPENH323_MINOR,OPENH323_BUILD) < VERSION(1,17,3)
 /**
  *  Workaround for broken (less than 1.17.3) OpenH323 stack to be able to
  *  make TCP connections from specific address