Re: [h323plus] Incorrect include directive in h323caps.h
Hi Jan. I'm copying to the list as it doesn't appear in my reply-to, maybe a gmail issue. On Wed, Aug 11, 2010 at 3:50 PM, Jan Willamowius <jan@willamowius.de> wrote:
Is there such a thing as an "installed H323Plus on Windows" ?
I don't know, I abandoned it 8 years ago after having used it since win1.0 and left it for the smart people. Too complex for me, love the kernel, hate the ui. I assumed if one can install it in Linux, there must be a way to do it in windows too.
Re the other instances of codecs.h includes, it would be the easiest if you would just post or mail me a "diff -u" and I'll put it into the CVS.
Will do it, here is what I've found: folarte@gkaps ~/tmp/h323plus $ ack -C3 '#include.*"\.\./include/codecs.h"' . src/opalwavfile.cxx 70- 71-#include "opalwavfile.h" 72- 73:#include "../include/codecs.h" 74- 75- 76- src/opalvxml.cxx 138- 139-#endif 140- 141:#include "../include/codecs.h" 142- 143-#define G7231_SAMPLES_PER_BLOCK 240 144-#define G7231_BANDWIDTH (6300/100) src/codecs.cxx 395-#endif 396- 397-#ifdef _MSC_VER 398:#include "../include/codecs.h" 399-#else 400-#include "codecs.h" 401-#endif include/h323caps.h 293- 294- 295-#ifdef _MSC_VER 296:#include "../include/codecs.h" 297-#else 298-#include "codecs.h" 299-#endif And here are the diffs, emacs vc-diff, which seem like unified: *** opalvxml.cxx.~1.3.~ Fri Aug 21 06:35:47 2009 --- opalvxml.cxx Wed Aug 11 16:40:05 2010 *************** *** 138,144 **** --- 138,148 ---- #endif + #ifdef _MSC_VER #include "../include/codecs.h" + #else + #include "codecs.h" + #endif #define G7231_SAMPLES_PER_BLOCK 240 #define G7231_BANDWIDTH (6300/100) *** opalwavfile.cxx.~1.4.~ Thu Jul 9 17:11:12 2009 --- opalwavfile.cxx Wed Aug 11 16:40:05 2010 *************** *** 70,76 **** --- 70,80 ---- #include "opalwavfile.h" + #ifdef _MSC_VER #include "../include/codecs.h" + #else + #include "codecs.h" + #endif Did a quick test make and worked well. Hope this helps. Regards. Francisco Olarte.
Patch applied. Thanks! On Unix there is a "make install" target that copies the files into the filesystem and "h323plus/include/*.h" becomes "/some/path/include/openh323/*.h" On Windows there is no such script and the paths from the source code stay intact. Compiling on Unix with installed H323Plus and PTLib is broken elsewhere, too. I forget where eactly, but SuSE had serious problems getting H323Plus to compile with an installed PTLib and stayed with a very old GnuGk, because they couldn't make it work. Regards, Jan Francisco Olarte (M) wrote:
Hi Jan.
I'm copying to the list as it doesn't appear in my reply-to, maybe a gmail issue.
On Wed, Aug 11, 2010 at 3:50 PM, Jan Willamowius <jan@willamowius.de> wrote:
Is there such a thing as an "installed H323Plus on Windows" ?
I don't know, I abandoned it 8 years ago after having used it since win1.0 and left it for the smart people. Too complex for me, love the kernel, hate the ui.
I assumed if one can install it in Linux, there must be a way to do it in windows too.
Re the other instances of codecs.h includes, it would be the easiest if you would just post or mail me a "diff -u" and I'll put it into the CVS.
Will do it, here is what I've found:
folarte@gkaps ~/tmp/h323plus $ ack -C3 '#include.*"\.\./include/codecs.h"' . src/opalwavfile.cxx 70- 71-#include "opalwavfile.h" 72- 73:#include "../include/codecs.h" 74- 75- 76-
src/opalvxml.cxx 138- 139-#endif 140- 141:#include "../include/codecs.h" 142- 143-#define G7231_SAMPLES_PER_BLOCK 240 144-#define G7231_BANDWIDTH (6300/100)
src/codecs.cxx 395-#endif 396- 397-#ifdef _MSC_VER 398:#include "../include/codecs.h" 399-#else 400-#include "codecs.h" 401-#endif
include/h323caps.h 293- 294- 295-#ifdef _MSC_VER 296:#include "../include/codecs.h" 297-#else 298-#include "codecs.h" 299-#endif
And here are the diffs, emacs vc-diff, which seem like unified:
*** opalvxml.cxx.~1.3.~ Fri Aug 21 06:35:47 2009 --- opalvxml.cxx Wed Aug 11 16:40:05 2010 *************** *** 138,144 **** --- 138,148 ----
#endif
+ #ifdef _MSC_VER #include "../include/codecs.h" + #else + #include "codecs.h" + #endif
#define G7231_SAMPLES_PER_BLOCK 240 #define G7231_BANDWIDTH (6300/100)
*** opalwavfile.cxx.~1.4.~ Thu Jul 9 17:11:12 2009 --- opalwavfile.cxx Wed Aug 11 16:40:05 2010 *************** *** 70,76 **** --- 70,80 ----
#include "opalwavfile.h"
+ #ifdef _MSC_VER #include "../include/codecs.h" + #else + #include "codecs.h" + #endif
Did a quick test make and worked well.
Hope this helps.
Regards. Francisco Olarte.
-- Jan Willamowius, jan@willamowius.de, http://www.gnugk.org/
participants (2)
-
Francisco Olarte (M) -
Jan Willamowius