Thread: [Opalvoip-svn] SF.net SVN: opalvoip: [18737] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
opalvoip-svn
|
From: <rjo...@us...> - 2007-10-22 13:51:27
|
Revision: 18737
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18737&view=rev
Author: rjongbloed
Date: 2007-10-22 06:51:31 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Many more PWLIBs changed to PTLIBs.
Modified Paths:
--------------
ptlib/trunk/Makefile.in
ptlib/trunk/ReadMe.txt
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/make/common.mak
ptlib/trunk/make/plugins.mak
ptlib/trunk/make/ptbuildopts.mak.in
ptlib/trunk/make/ptlib-config.in
ptlib/trunk/make/ptlib.mak
ptlib/trunk/make/unix.mak
ptlib/trunk/plugins/configure
ptlib/trunk/plugins/configure.in
ptlib/trunk/plugins/sound_alsa/Makefile
ptlib/trunk/plugins/sound_esd/Makefile
ptlib/trunk/plugins/sound_oss/Makefile
ptlib/trunk/plugins/sound_sunaudio/Makefile
ptlib/trunk/plugins/vidinput_avc/Makefile
ptlib/trunk/plugins/vidinput_bsd/Makefile
ptlib/trunk/plugins/vidinput_dc/Makefile.in
ptlib/trunk/plugins/vidinput_v4l/Makefile
ptlib/trunk/plugins/vidinput_v4l2/Makefile
ptlib/trunk/ptlib.dxy
ptlib/trunk/samples/ThreadSafe/Makefile
ptlib/trunk/samples/address/Makefile
ptlib/trunk/samples/audio/Makefile
ptlib/trunk/samples/dnstest/Makefile
ptlib/trunk/samples/dtmftest/Makefile
ptlib/trunk/samples/emailtest/Makefile
ptlib/trunk/samples/factory/Makefile
ptlib/trunk/samples/find_ip/Makefile
ptlib/trunk/samples/hello_world/Makefile
ptlib/trunk/samples/ipv6test/Makefile
ptlib/trunk/samples/ldaptest/Makefile
ptlib/trunk/samples/md5/Makefile
ptlib/trunk/samples/netif/Makefile
ptlib/trunk/samples/ptimer/Makefile
ptlib/trunk/samples/pxml/Makefile
ptlib/trunk/samples/queue/Makefile
ptlib/trunk/samples/safetest/Makefile
ptlib/trunk/samples/serial/Makefile
ptlib/trunk/samples/sortedlist/Makefile
ptlib/trunk/samples/strtest/Makefile
ptlib/trunk/samples/stunclient/Makefile
ptlib/trunk/samples/thread/Makefile
ptlib/trunk/samples/threadex/Makefile
ptlib/trunk/samples/timing/Makefile
ptlib/trunk/samples/vidtest/Makefile
ptlib/trunk/samples/wavfile/Makefile
ptlib/trunk/samples/xmlrpc/Makefile
ptlib/trunk/samples/xmlrpcsrvr/Makefile
ptlib/trunk/samples/xmppconsole/Makefile
ptlib/trunk/samples/xmpptest/Makefile
ptlib/trunk/src/ptlib/Nucleus++/Makefile
ptlib/trunk/src/ptlib/msos/Makefile
ptlib/trunk/src/ptlib/unix/Makefile
ptlib/trunk/tools/StringTest/Makefile
ptlib/trunk/tools/asnparser/Makefile
ptlib/trunk/tools/plugintest/Makefile
Removed Paths:
-------------
ptlib/trunk/ptlib.dxx
Modified: ptlib/trunk/Makefile.in
===================================================================
--- ptlib/trunk/Makefile.in 2007-10-22 13:51:13 UTC (rev 18736)
+++ ptlib/trunk/Makefile.in 2007-10-22 13:51:31 UTC (rev 18737)
@@ -213,7 +213,7 @@
PREFIX=@INSTALLPREFIX@
exec_prefix = ${PREFIX}
LIBDIR=@LIBDIR@
-export PWLIBDIR=@PWLIBDIR@
+export PTLIBDIR=@PTLIBDIR@
INSTALL=@INSTALL@
@@ -254,7 +254,7 @@
$(DESTDIR)$(PREFIX)/include/ptlib \
$(DESTDIR)$(PREFIX)/include/ptlib/unix/ptlib \
$(DESTDIR)$(PREFIX)/include/ptclib \
- $(DESTDIR)$(PREFIX)/share/pwlib/make ; \
+ $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
do mkdir -p $$dir ; chmod 755 $$dir ; \
done )
$(INSTALL) -m 444 lib/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
@@ -275,12 +275,12 @@
ln -sf $(PTLIB_FILE) libpt.@SHAREDLIBEXT@ \
)
ifeq (1, $(HAS_PLUGINS))
- cd plugins/pwlib/device/ ; \
+ cd plugins/ptlib/device/ ; \
( for dir in ./* ;\
- do mkdir -p $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir ; \
- chmod 755 $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir ; \
+ do mkdir -p $(DESTDIR)$(LIBDIR)/ptlib/devices/$$dir ; \
+ chmod 755 $(DESTDIR)$(LIBDIR)/ptlib/devices/$$dir ; \
(for fn in ./$$dir/*.so ; \
- do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/pwlib/devices/$$dir; \
+ do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/ptlib/devices/$$dir; \
done ); \
done )
endif
@@ -296,18 +296,18 @@
do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/include/ptclib; \
done)
(for fn in make/*.mak ; \
- do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/share/pwlib/make; \
+ do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/share/ptlib/make; \
done)
- $(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/pwlib/make/
- (cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/pwlib/make/ptlib-config ptlib-config)
+ $(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
+ (cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
uninstall:
rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
$(DESTDIR)$(PREFIX)/include/ptclib \
$(DESTDIR)$(PREFIX)/include/ptlib.h \
$(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
- $(DESTDIR)$(PREFIX)/share/pwlib \
- $(DESTDIR)$(LIBDIR)/pwlib/devices \
+ $(DESTDIR)$(PREFIX)/share/ptlib \
+ $(DESTDIR)$(LIBDIR)/ptlib/devices \
rm -f $(DESTDIR)@libdir@/$(PTLIB_FILE)* \
@libdir@/libpt.so
Modified: ptlib/trunk/ReadMe.txt
===================================================================
--- ptlib/trunk/ReadMe.txt 2007-10-22 13:51:13 UTC (rev 18736)
+++ ptlib/trunk/ReadMe.txt 2007-10-22 13:51:31 UTC (rev 18737)
@@ -5,15 +5,15 @@
Contents
--------
- 1. Introduction
- 2. Apologies
- 3. CVS Access
- 4. Building PTLib
- 5. Using PTLib
- 6. IPv6 issues
- 7. Platform Specific Issues
- 8. Conclusion
- 9. Licensing
+ 1. Introduction
+ 2. Apologies
+ 3. CVS Access
+ 4. Building PTLib
+ 5. Using PTLib
+ 6. IPv6 issues
+ 7. Platform Specific Issues
+ 8. Conclusion
+ 9. Licensing
@@ -22,16 +22,16 @@
1. Introduction
---------------
-PTLib (Portable Tools Library) is a moderately large class library that has it's genesis
-many years ago as PWLib (portable Windows Library), a method to product applications to run
-on both Microsoft Windows and Unix systems. It has also been ported to other systems such
-as Mac OSX, VxWorks and other embedded systems
+PTLib (Portable Tools Library) is a moderately large class library that has it's
+genesis many years ago as PWLib (portable Windows Library), a method to product
+applications to run on both Microsoft Windows and Unix systems. It has also been
+ported to other systems such as Mac OSX, VxWorks and other embedded systems
Since then the system has grown to include many classes that assist in writing
-complete multi-platform applications. Classes for I/O portability, multi-threading
-portability, aid in producing unix daemons and NT services portably and all
-sorts of internet protocols were added over the years. So it became a Portable
-Tools Library and was renamed to PTLib.
+complete multi-platform applications. Classes for I/O portability, multi-
+threading portability, aid in producing unix daemons and NT services portably
+and all sorts of internet protocols were added over the years. So it became a
+Portable Tools Library and was renamed to PTLib.
All this over and above basic "container" classes such as arrays, linear lists,
sorted lists (RB Tree) and dictionaries (hash tables) which were all created
@@ -78,13 +78,13 @@
There is a public SVN archive available at svn.sourceforge.net. To extract, use a
command line like the following:
- cvs -z3 -d :pserver:ano...@cv...:/cvsroot/openh323 co module
+ cvs -z3 -d :pserver:ano...@cv...:/cvsroot/openh323 co module
where "module" is one of the module names specified above.
If you would like see the structure of the CVS, then use the View CVS tool at:
- http://cvs.sourceforge.net/viewcvs.py/openh323/
+ http://cvs.sourceforge.net/viewcvs.py/openh323/
================================================================================
@@ -116,19 +116,18 @@
Note that more complete instructions can be found at the following URL, but here
are the basics:
- http://www.voxgratia.org/docs/ptlib_windows.html
+ http://www.voxgratia.org/docs/ptlib_windows.html
1. Note you will need the bison and flex tools to compile some parts of the
system. You can get a copy from http://www.openh323.org/bin/flexbison.zip,
follow the instructions included in that package and put the executables
somewhere in your path.
-2. Start MSVC (v5, v6 or v7 (.NET)). If you have another compiler you are on
- your own! Add these folders to the Include Files path as follows:
+2. Start DevStudio .NET 2003 or .NET 2005. MSVC v6 may work, but is no longer
+ actively supported. If you have another compiler you are on your own! Add
+ these directories to the Include Files path as follows:
- In VisualStudio v5/6 go into the Tools menu, Options item, Directories tab.
-
- In VisualStudio v7, go into the Tools menu, Options item. In the Options
+ In VisualStudio v7/8, go into the Tools menu, Options item. In the Options
dialog, open the Projects folder, VC++ Directories item. In the 'Show
Directories for:' list, select 'Include files'.
@@ -142,7 +141,12 @@
directory to your PATH environment variable (so the MergeSym tool can
be found).
-2. The build should automatically create a file ptlib/include/ptbuildopts.h
+3. Open the ptlib.sln or ptlib_2005.sln file for DevStudio 2003 or 2005
+ respectively.
+
+4. Select Release mode and build MergeSym.
+
+ The build should automatically create a file ptlib/include/ptbuildopts.h
via the configure.exe program that should be in the ptlib directory. If
you have any problems try running the program directly from a command
line. Use ".\configure --help" to get information on options such as
@@ -152,13 +156,10 @@
to compile the various libraries in a manner suitable for use by PTLib
under Windows.
-3. In VisualStudio v5/6 open the ptlib.dsw file in the ptlib top directory.
- If you have the minimum library it will come up with several requests to
- find .dsp files, just cancel past these.
-
- In VisualStudio v7 open the ptlib.sln file in the ptlib top directory.
+5. You can then build the entire solution for Release, Debug and No Trace
+ versions as you require.
-4. That's it, now you're on your own!
+5. That's it, now you're on your own!
@@ -182,9 +183,10 @@
--------------
1. If you have not put ptlib it into your home directory (~/ptlib) then
- you will have to defined the environment variable PWLIBDIR to point to
+ you will have to defined the environment variable PTLIBDIR to point to
the correct directory.
- Also make sure you have added the $PWLIBDIR/lib directory to your
+
+ Also make sure you have added the $PTLIBDIR/lib directory to your
LD_LIBRARY_PATH environment variable if you intend to use shared
libraries (the default).
@@ -301,18 +303,18 @@
PROG = hello
SOURCES = hello.cxx
-ifndef PWLIBDIR
+ifndef PTLIBDIR
PTLIBDIR=$(HOME)/ptlib
endif
-include $(PWLIBDIR)/make/ptlib.mak
+include $(PTLIBDIR)/make/ptlib.mak
# End of Makefile
--------------------------------------------------------------------------------
-5.2. PWlib Classes
+5.2. PTlib Classes
------------------
The classes in PTLib fall into the following broad categories
@@ -350,12 +352,11 @@
6. IPv6 support in ptlib
------------------------
-The IPv6 support in ptlib is still experimental. You have to get the latest
-CVS version to compile it (does work since 7th November 2002). Pwlib can be
-compiled with or without the IPv6 support.
+The IPv6 support in PTlib is supported and can be enabled or disabled via
+the configure program.
When compiled with the IPv6 support, applications using only IPv4 are still
-fully backward compatible. Pwlib is able to manage simultaneously IPv4 and
+fully backward compatible. PTLib is able to manage simultaneously IPv4 and
IPv6 connections.
@@ -804,7 +805,7 @@
----------------------------
The standard build for OpenSSL off http://www.openssl.org does work though it
is rather tricky and requires things like Perl to be installed on your
-Windows box. However the build does work and is correct for PWlib use. Make
+Windows box. However the build does work and is correct for PTlib use. Make
sure you build the non-DLL Debug and Release versions.
7.8.2. EXPAT under Windows
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2007-10-22 13:51:13 UTC (rev 18736)
+++ ptlib/trunk/configure 2007-10-22 13:51:31 UTC (rev 18737)
@@ -1,55 +1,26 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.59.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
@@ -58,43 +29,8 @@
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" "" $as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
-
# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH
PS1='$ '
PS2='> '
PS4='+ '
@@ -108,19 +44,18 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -128,388 +63,157 @@
# Name of the executable.
-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ X"$0" : 'X\(/\)$' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
+ /^X\/\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
-if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
-else
- as_have_required=no
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
+ # Find who we are. Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
-else
- as_candidate_shells=
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ case $CONFIG_SHELL in
+ '')
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ for as_base in sh bash ksh sh5; do
+ case $as_dir in
/*)
- for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
- done;;
- esac
-done
-IFS=$as_save_IFS
-
-
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
+ if ("$as_dir/$as_base" -c '
as_lineno_1=$LINENO
as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ CONFIG_SHELL=$as_dir/$as_base
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ fi;;
+ esac
+ done
+done
+;;
+ esac
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell aut...@gn... about your system,
- echo including any error possibly output before this
- echo message
-}
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
+ # line-number line before each line; the second 'sed' does the real
+ # work. The second script uses 'N' to pair each line-number line
+ # with the numbered line, and appends trailing '-' during
+ # substitution so that $LINENO is not a special case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+ sed '=' <$as_myself |
sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ s,$,-,
+ : loop
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
t loop
- s/-\n.*//
+ s,-$,,
+ s,^['$as_cr_digits']*\n,,
' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
+ chmod +x $as_me.lineno ||
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
+ # original and so on. Autoconf is especially sensible to this).
+ . ./$as_me.lineno
# Exit status is that of the last command.
exit
}
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir
-fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -518,28 +222,7 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -548,27 +231,39 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
-exec 7<&0 </dev/null 6>&1
+# CDPATH.
+$as_unset CDPATH
+
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+exec 6>&1
+
#
# Initializations.
#
ac_default_prefix=/usr/local
-ac_clean_files=
ac_config_libobj_dir=.
-LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete. It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
@@ -577,184 +272,46 @@
PACKAGE_BUGREPORT=
ac_unique_file="include/ptlib.h"
+ac_subdirs_all="$ac_subdirs_all plugins"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
# include <strings.h>
#endif
-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H
# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-subdirs
-CXX
-CXXFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CXX
-EXEEXT
-OBJEXT
-PWLIBDIR
-PWINSTDIR
-INSTALLPREFIX
-LIBDIR
-MAJOR_VERSION
-MINOR_VERSION
-BUILD_NUMBER
-PWLIB_VERSION
-BUILD_TYPE
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-MACHTYPE
-OSTYPE
-OSRELEASE
-TARGETDIR
-USE_GCC
-USE_PCH
-SHAREDLIBEXT
-CXXCPP
-GREP
-EGREP
-FLEX
-AR
-BISON
-HAS_REGEX
-HAS_PLUGINS
-HAS_RESOLVER
-HAS_SASL
-HAS_SASL2
-HAS_OPENLDAP
-HAS_OPENSSL
-P_STATIC_ENDLDLIBS
-P_STATIC_LDFLAGS
-HAS_EXPAT
-HAS_VXML
-HAS_JABBER
-HAS_XMLRPC
-HAS_SOAP
-HAS_TTS
-HAS_IPV6
-HAS_SDL
-HAS_VIDEO
-HAS_VIDEO_CAPTURE
-USE_SHM_VIDEO_DEVICES
-HAS_ASN
-HAS_STUN
-HAS_PIPECHAN
-HAS_DTMF
-HAS_WAVFILE
-HAS_SOCKS
-HAS_FTP
-HAS_SNMP
-HAS_TELNET
-HAS_REMCONN
-HAS_SERIAL
-HAS_POP3SMTP
-HAS_HTTP
-HAS_HTTPSVC
-HAS_CONFIG_FILE
-HAS_SOCKAGG
-HAS_VIDFILE
-HAS_AUDIO
-HAS_OSS
-HAS_ALSA
-HAS_ODBC
-STDCCFLAGS
-STDCXXFLAGS
-OPTSTDCCFLAGS
-ENDLDLIBS
-DEBUG_FLAG
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-LIBOBJS
-LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PTLIBDIR PTINSTDIR INSTALLPREFIX LIBDIR MAJOR_VERSION MINOR_VERSION BUILD_NUMBER PTLIB_VERSION BUILD_TYPE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHTYPE OSTYPE OSRELEASE TARGETDIR USE_GCC USE_PCH SHAREDLIBEXT CXXCPP EGREP FLEX AR BISON HAS_REGEX HAS_PLUGINS HAS_RESOLVER HAS_SASL HAS_SASL2 HAS_OPENLDAP HAS_OPENSSL P_STATIC_ENDLDLIBS P_STATIC_LDFLAGS HAS_EXPAT HAS_VXML HAS_JABBER HAS_XMLRPC HAS_SOAP HAS_TTS HAS_IPV6 HAS_SDL HAS_VIDEO HAS_VIDEO_CAPTURE USE_SHM_VIDEO_DEVICES HAS_ASN HAS_STUN HAS_PIPECHAN HAS_DTMF HAS_WAVFILE HAS_SOCKS HAS_FTP HAS_SNMP HAS_TELNET HAS_REMCONN HAS_SERIAL HAS_POP3SMTP HAS_HTTP HAS_HTTPSVC HAS_CONFIG_FILE HAS_SOCKAGG HAS_VIDFILE HAS_AUDIO HAS_OSS HAS_ALSA HAS_ODBC STDCCFLAGS STDCXXFLAGS OPTSTDCCFLAGS ENDLDLIBS DEBUG_FLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
ac_subst_files=''
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CXX
-CXXFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CCC
-CXXCPP'
-ac_subdirs_all='plugins'
# Initialize some variables set by options.
ac_init_help=
@@ -781,48 +338,34 @@
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
+datadir='${prefix}/share'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
ac_prev=
-ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
+ eval "$ac_prev=\$ac_option"
ac_prev=
continue
fi
- case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
- esac
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
+ case $ac_option in
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -844,45 +387,33 @@
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad)
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
datadir=$ac_optarg ;;
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ eval "enable_$ac_feature=no" ;;
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "enable_$ac_feature='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -909,12 +440,6 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -939,16 +464,13 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -1013,16 +535,6 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -1075,20 +587,24 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "with_$ac_package='$ac_optarg'" ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+ eval "with_$ac_package=no" ;;
--x)
# Obsolete; use --with-x.
@@ -1119,7 +635,8 @@
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
- eval $ac_envvar=\$ac_optarg
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ eval "$ac_envvar='$ac_optarg'"
export $ac_envvar ;;
*)
@@ -1139,21 +656,29 @@
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute directory names.
-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
do
- eval ac_val=\$$ac_var
+ eval ac_val=$`echo $ac_var`
case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
done
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ localstatedir libdir includedir oldincludedir infodir mandir
+do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
# FIXME: To remove some day.
@@ -1178,76 +703,74 @@
test "$silent" = yes && exec 6>/dev/null
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
+ # Try the directory containing this script, then its parent.
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$0" : 'X\(//\)[^/]' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
+ if test ! -r $srcdir/$ac_unique_file; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r $srcdir/$ac_unique_file; then
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ else
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
- pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
+ fi
fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
#
# Report the --help message.
@@ -1276,6 +799,9 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
+_ACEOF
+
+ cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -1293,22 +819,15 @@
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --infodir=DIR info documentation [PREFIX/info]
+ --mandir=DIR man documentation [PREFIX/man]
_ACEOF
cat <<\_ACEOF
@@ -1382,95 +901,126 @@
CXXFLAGS C++ compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+ headers in a nonstandard directory <include dir>
CXXCPP C++ preprocessor
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
_ACEOF
-ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
+ ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d $ac_dir || continue
ac_builddir=.
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
+if test "$ac_dir" != .; then
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
case $srcdir in
- .) # We are building in place.
+ .) # No --srcdir option. We are building in place.
ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+ cd $ac_dir
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
+ echo
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_srcdir/configure; then
+ echo
+ $SHELL $ac_srcdir/configure --help=recursive
+ elif test -f $ac_srcdir/configure.ac ||
+ test -f $ac_srcdir/configure.in; then
+ echo
+ $ac_configure --help
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
+ fi
+ cd $ac_popdir
done
fi
-test -n "$ac_init_help" && exit $ac_status
+test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.61
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit
+ exit 0
fi
-cat >config.log <<_ACEOF
+exec 5>config.log
+cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
_ACEOF
-exec 5>>config.log
{
cat <<_ASUNAME
## --------- ##
@@ -1489,7 +1039,7 @@
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
@@ -1503,7 +1053,6 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
-IFS=$as_save_IFS
} >&5
@@ -1525,6 +1074,7 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
+ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1535,7 +1085,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *\'*)
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1557,7 +1107,9 @@
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+ ac_sep=" "
;;
esac
done
@@ -1568,8 +1120,8 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -1582,34 +1134,20 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
+{
(set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
sed -n \
- "s/'\''/'\''\\\\'\'''\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
- ;; #(
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
*)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ sed -n \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
- esac |
- sort
-)
+ esac;
+}
echo
cat <<\_ASBOX
@@ -1620,28 +1158,22 @@
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
+## ------------- ##
+## Output files. ##
+## ------------- ##
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -1653,24 +1185,26 @@
## ----------- ##
_ASBOX
echo
- cat confdefs.h
+ sed "/^$/d" confdefs.h | sort
echo
fi
test "$ac_signal" != 0 &&
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core &&
+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
-' 0
+ ' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
# Predefined preprocessor variables.
@@ -1701,17 +1235,14 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ else
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ fi
fi
-shift
-for ac_site_file
-do
+for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1727,8 +1258,8 @@
{ echo "$as_me:$LINENO: ...
[truncated message content] |
|
From: <sh...@us...> - 2007-10-22 18:33:46
|
Revision: 18738
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18738&view=rev
Author: shorne
Date: 2007-10-22 11:33:45 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Visual Studio Support
Modified Paths:
--------------
ptlib/trunk/include/ptclib/pvfiledev.h
ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
Modified: ptlib/trunk/include/ptclib/pvfiledev.h
===================================================================
--- ptlib/trunk/include/ptclib/pvfiledev.h 2007-10-22 13:51:31 UTC (rev 18737)
+++ ptlib/trunk/include/ptclib/pvfiledev.h 2007-10-22 18:33:45 UTC (rev 18738)
@@ -152,6 +152,13 @@
virtual PStringList GetDeviceNames() const
{ return GetInputDeviceNames(); }
+ /**Retrieve a list of Device Capabilities
+ */
+ static BOOL GetDeviceCapabilities(
+ const PString & /*deviceName*/, ///< Name of device
+ InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
+ ) { return FALSE; }
+
/**Get the maximum frame size in bytes.
Note a particular device may be able to provide variable length
Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2007-10-22 13:51:31 UTC (rev 18737)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2007-10-22 18:33:45 UTC (rev 18738)
@@ -38,8 +38,8 @@
#ifdef _MSC_VER
#ifndef _WIN32_WCE
-#pragma comment(lib,"strmbase.lib")
#pragma comment(lib,"strmiids.lib")
+#pragma comment(lib,"quartz.lib")
#endif
#endif
@@ -54,6 +54,28 @@
PCREATE_VIDINPUT_PLUGIN(DirectShow);
+
+static void MyDeleteMediaType(AM_MEDIA_TYPE *pmt)
+{
+ if (pmt == NULL)
+ return;
+
+ if (pmt->cbFormat != 0)
+ {
+ CoTaskMemFree((PVOID)pmt->pbFormat);
+ pmt->cbFormat = 0;
+ pmt->pbFormat = NULL;
+ }
+ if (pmt->pUnk != NULL)
+ {
+ // Uncessessary because pUnk should not be used, but safest.
+ pmt->pUnk->Release();
+ pmt->pUnk = NULL;
+ }
+
+ CoTaskMemFree(pmt);
+}
+
PVideoInputDevice_DirectShow::PVideoInputDevice_DirectShow()
{
PTRACE(1,"PVidDirectShow\tPVideoInputDevice_DirectShow: constructor" );
@@ -228,7 +250,6 @@
PStringList PVideoInputDevice_DirectShow::GetInputDeviceNames()
{
HRESULT hr;
- IBaseFilter * pSrc = NULL;
IMoniker *pMoniker =NULL;
ICreateDevEnum *pDevEnum =NULL;
IEnumMoniker *pClassEnum = NULL;
@@ -265,16 +286,8 @@
return list;
}
- while (1)
+ while (hr = pClassEnum->Next(1, &pMoniker, &cFetched), hr==S_OK)
{
- // Get the next device
- hr = pClassEnum->Next(1, &pMoniker, &cFetched);
- if (hr != S_OK)
- {
- PTRACE(4, "PVidDirectShow\tGetInputDeviceNames() No more video capture device");
- break;
- }
-
// Get the property bag
IPropertyBag *pPropBag;
@@ -317,7 +330,7 @@
/* FIXME: If the device is already open, close it */
if (IsOpen())
- Close();
+ return TRUE;
deviceName = devName;
@@ -447,7 +460,6 @@
BOOL PVideoInputDevice_DirectShow::Stop()
{
- HRESULT hr;
PTRACE(1,"PVidDirectShow\tStop()");
@@ -475,19 +487,20 @@
void PVideoInputDevice_DirectShow::FlipVertical(BYTE *buffer)
{
unsigned int bytesPerLine = frameBytes / frameHeight;
- BYTE templine[bytesPerLine];
+ BYTE * templine = new BYTE[bytesPerLine];
BYTE *s = buffer;
BYTE *d = buffer + frameBytes - bytesPerLine;
unsigned int i;
for (i=0; i<frameHeight/2; i++)
{
- memcpy(templine, s, bytesPerLine);
+ memcpy(&templine, s, bytesPerLine);
memcpy(s, d, bytesPerLine);
- memcpy(d, templine, bytesPerLine);
+ memcpy(d, &templine, bytesPerLine);
s += bytesPerLine;
d -= bytesPerLine;
}
+ delete templine;
}
/*
@@ -621,9 +634,9 @@
AM_MEDIA_TYPE *pMediaFormat;
int iCount, iSize;
VIDEO_STREAM_CONFIG_CAPS scc;
- unsigned int i;
+ int i;
BOOL was_capturing = FALSE;
- OAFilterState filterState;
+ OAFilterState filterState = State_Stopped;
PTRACE(4, "PVidDirectShow\tSetFormat(\""
<< (wanted_format.IsEmpty()?"Not changed":wanted_format) <<"\", "
@@ -662,7 +675,7 @@
return FALSE;
}
- for (i=0; i<iCount; i++, DeleteMediaType(pMediaFormat))
+ for (i=0; i<iCount; i++, MyDeleteMediaType(pMediaFormat))
{
pMediaFormat = NULL;
hr = pStreamConfig->GetStreamCaps(i, &pMediaFormat, (BYTE *)&scc);
@@ -764,7 +777,7 @@
}
#endif
- DeleteMediaType(pMediaFormat);
+ MyDeleteMediaType(pMediaFormat);
pStreamConfig->Release();
return TRUE;
}
@@ -1025,6 +1038,12 @@
}
+BOOL PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities & /*caps*/)
+{
+ // To do!
+ return FALSE;
+}
+
/*
*
*
@@ -1036,7 +1055,7 @@
AM_MEDIA_TYPE *pMediaFormat;
int iCount, iSize;
VIDEO_STREAM_CONFIG_CAPS scc;
- unsigned int i;
+ int i;
PTRACE(1, "PVidDirectShow\tListSupportedFormats()");
@@ -1087,7 +1106,7 @@
<< (10000000.0/VideoInfo->AvgTimePerFrame) << "fps)");
}
- DeleteMediaType(pMediaFormat);
+ MyDeleteMediaType(pMediaFormat);
}
pStreamConfig->Release();
@@ -1145,8 +1164,10 @@
}
- DeleteMediaType(pMediaFormat);
+ MyDeleteMediaType(pMediaFormat);
pStreamConfig->Release();
+
+ return TRUE;
}
@@ -1207,8 +1228,13 @@
if (dwMsgLen)
return string;
+#ifdef __MINGW32__ // This function is not recognised in Windows
snprintf(string, sizeof(string), "0x%8.8x", hr);
- return string;
+ return string;
+#else
+ return PString();
+#endif
+
}
static HRESULT SetDevice(const PString & devName, IBaseFilter ** ppSrcFilter)
@@ -1312,20 +1338,17 @@
}
-struct pwlib_fmt
-{
+struct {
char *pwlib_format;
GUID media_format;
-};
-
-static struct pwlib_fmt formats[] =
+} formats[] =
{
{(char*) "Grey", MEDIASUBTYPE_RGB8 },
{(char*) "BGR32", MEDIASUBTYPE_RGB32}, /* Microsoft assumes that we are in little endian */
{(char*) "BGR24", MEDIASUBTYPE_RGB24},
{(char*) "RGB565", MEDIASUBTYPE_RGB565},
{(char*) "RGB555", MEDIASUBTYPE_RGB555},
- {(char*) "YUV420P", MEDIASUBTYPE_I420},
+ {(char*) "YUV420P", MEDIASUBTYPE_IYUV},
{(char*) "YUV422P", MEDIASUBTYPE_YUYV},
{(char*) "YUV411", MEDIASUBTYPE_Y411},
{(char*) "YUV411P", MEDIASUBTYPE_Y41P},
@@ -1416,7 +1439,7 @@
return "BGR24";
else if (guid == MEDIASUBTYPE_RGB32)
return "BGR32";
- else if (guid == MEDIASUBTYPE_I420)
+ else if (guid == MEDIASUBTYPE_IYUV)
return "I420";
else
return guid_to_string(guid); /* FIXME: memory leak */
@@ -1437,29 +1460,4 @@
return strdup(guid_string);
}
-#ifdef __MINGW32__
-
-static void DeleteMediaType(AM_MEDIA_TYPE *pmt)
-{
- if (pmt == NULL)
- return;
-
- if (pmt->cbFormat != 0)
- {
- CoTaskMemFree((PVOID)pmt->pbFormat);
- pmt->cbFormat = 0;
- pmt->pbFormat = NULL;
- }
- if (pmt->pUnk != NULL)
- {
- // Uncessessary because pUnk should not be used, but safest.
- pmt->pUnk->Release();
- pmt->pUnk = NULL;
- }
-
- CoTaskMemFree(pmt);
-}
-
-#endif
-
#endif /*P_DIRECTSHOW*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2007-10-22 18:37:26
|
Revision: 18739
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18739&view=rev
Author: shorne
Date: 2007-10-22 11:36:06 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Added ability to get device capabilities for Input Devices
Modified Paths:
--------------
ptlib/trunk/include/ptlib/videoio.h
ptlib/trunk/src/ptlib/common/vfakeio.cxx
ptlib/trunk/src/ptlib/msos/vfw.cxx
Modified: ptlib/trunk/include/ptlib/videoio.h
===================================================================
--- ptlib/trunk/include/ptlib/videoio.h 2007-10-22 18:33:45 UTC (rev 18738)
+++ ptlib/trunk/include/ptlib/videoio.h 2007-10-22 18:36:06 UTC (rev 18739)
@@ -267,6 +267,7 @@
#include <ptlib/plugin.h>
#include <ptlib/pluginmgr.h>
+#include <list>
class PColourConverter;
@@ -963,7 +964,16 @@
#endif // SHOULD_BE_MOVED_TO_PLUGIN
+typedef struct {
+public:
+ unsigned height;
+ unsigned width;
+ const char* format;
+ double fps;
+} InputDeviceCapability;
+typedef std::list<InputDeviceCapability> InputDeviceCapabilities;
+
/**This class defines a video input device.
*/
class PVideoInputDevice : public PVideoDevice
@@ -1035,6 +1045,13 @@
BOOL startImmediate = TRUE ///< Immediately start display
);
+ /**Retrieve a list of Device Capabilities
+ */
+ static BOOL GetDeviceCapabilities(
+ const PString & /*deviceName*/, ///< Name of device
+ InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
+ ) { return FALSE; }
+
/**Open the device given the device name.
*/
virtual BOOL Open(
@@ -1089,6 +1106,8 @@
public:
virtual PObject * CreateInstance(int /*userData*/) const { return new className; }
virtual PStringList GetDeviceNames(int /*userData*/) const { return className::GetInputDeviceNames(); }
+ virtual BOOL GetDeviceCapabilities(const PString & deviceName, InputDeviceCapabilities & caps) const
+ { return className::GetDeviceCapabilities(deviceName,caps); }
};
#define PCREATE_VIDINPUT_PLUGIN(name) \
Modified: ptlib/trunk/src/ptlib/common/vfakeio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/vfakeio.cxx 2007-10-22 18:33:45 UTC (rev 18738)
+++ ptlib/trunk/src/ptlib/common/vfakeio.cxx 2007-10-22 18:36:06 UTC (rev 18739)
@@ -1488,6 +1488,13 @@
virtual PStringList GetDeviceNames() const
{ return GetInputDeviceNames(); }
+ /**Retrieve a list of Device Capabilities
+ */
+ static BOOL GetDeviceCapabilities(
+ const PString & /*deviceName*/, ///< Name of device
+ InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
+ ) { return FALSE; }
+
/**Get the maximum frame size in bytes.
Note a particular device may be able to provide variable length
Modified: ptlib/trunk/src/ptlib/msos/vfw.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vfw.cxx 2007-10-22 18:33:45 UTC (rev 18738)
+++ ptlib/trunk/src/ptlib/msos/vfw.cxx 2007-10-22 18:36:06 UTC (rev 18739)
@@ -389,6 +389,13 @@
virtual PStringList GetDeviceNames() const
{ return GetInputDeviceNames(); }
+ /**Retrieve a list of Device Capabilities
+ */
+ static BOOL GetDeviceCapabilities(
+ const PString & /*deviceName*/, ///< Name of device
+ InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
+ ) { return FALSE; }
+
/**Open the device given the device name.
*/
virtual BOOL Open(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-10-23 05:10:05
|
Revision: 18750
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18750&view=rev
Author: rjongbloed
Date: 2007-10-22 22:10:09 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Applied OpenH323 patch 1532400
Function to do interface selection based on remote address.
Thanks Drazen Dimoti (jimbosimo)
Modified Paths:
--------------
ptlib/trunk/include/ptlib/ipsock.h
ptlib/trunk/src/ptlib/msos/ethsock.cxx
Modified: ptlib/trunk/include/ptlib/ipsock.h
===================================================================
--- ptlib/trunk/include/ptlib/ipsock.h 2007-10-23 04:14:53 UTC (rev 18749)
+++ ptlib/trunk/include/ptlib/ipsock.h 2007-10-23 05:10:09 UTC (rev 18750)
@@ -776,7 +776,16 @@
*/
static PString GetGatewayInterface();
- #ifdef _WIN32
+ /** Get the interface address that will be used to reach the specified
+ remote address. Uses longest prefix match when multiple matching interfaces
+ are found.
+
+ @return
+ Network interface address.
+ */
+ static PIPSocket::Address GetRouteInterfaceAddress(PIPSocket::Address remoteAddress);
+
+#ifdef _WIN32
/** Get the IP address for the interface that is being used as the gateway,
that is, the interface that packets on the default route will be sent.
Modified: ptlib/trunk/src/ptlib/msos/ethsock.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/ethsock.cxx 2007-10-23 04:14:53 UTC (rev 18749)
+++ ptlib/trunk/src/ptlib/msos/ethsock.cxx 2007-10-23 05:10:09 UTC (rev 18750)
@@ -1994,6 +1994,57 @@
return snmp.GetInterfaceName(ifNum);
}
+
+PIPSocket::Address PIPSocket::GetRouteInterfaceAddress(PIPSocket::Address remoteAddress)
+{
+ PIPSocket::InterfaceTable hostInterfaceTable;
+ PIPSocket::GetInterfaceTable(hostInterfaceTable);
+
+ PIPSocket::RouteTable hostRouteTable;
+ PIPSocket::GetRouteTable(hostRouteTable);
+
+ if (hostInterfaceTable.IsEmpty())
+ return PIPSocket::GetDefaultIpAny();
+
+ for (PINDEX IfaceIdx = 0; IfaceIdx < hostInterfaceTable.GetSize(); IfaceIdx++) {
+ if (remoteAddress == hostInterfaceTable[IfaceIdx].GetAddress()) {
+ PTRACE(5, "PWLib\tRoute packet for " << remoteAddress
+ << " over interface " << hostInterfaceTable[IfaceIdx].GetName()
+ << "[" << hostInterfaceTable[IfaceIdx].GetAddress() << "]");
+ return hostInterfaceTable[IfaceIdx].GetAddress();
+ }
+ }
+
+ PIPSocket::RouteEntry * route = NULL;
+ for (PINDEX routeIdx = 0; routeIdx < hostRouteTable.GetSize(); routeIdx++) {
+ PIPSocket::RouteEntry & routeEntry = hostRouteTable[routeIdx];
+
+ DWORD network = (DWORD) routeEntry.GetNetwork();
+ DWORD mask = (DWORD) routeEntry.GetNetMask();
+
+ if (((DWORD)remoteAddress & mask) == network) {
+ if (route == NULL)
+ route = &routeEntry;
+ else if ((DWORD)routeEntry.GetNetMask() > (DWORD)route->GetNetMask())
+ route = &routeEntry;
+ }
+ }
+
+ if (route != NULL) {
+ for (PINDEX IfaceIdx = 0; IfaceIdx < hostInterfaceTable.GetSize(); IfaceIdx++) {
+ if (route->GetInterface() == hostInterfaceTable[IfaceIdx].GetName()) {
+ PTRACE(5, "PWLib\tRoute packet for " << remoteAddress
+ << " over interface " << hostInterfaceTable[IfaceIdx].GetName()
+ << "[" << hostInterfaceTable[IfaceIdx].GetAddress() << "]");
+ return hostInterfaceTable[IfaceIdx].GetAddress();
+ }
+ }
+ }
+
+ return PIPSocket::GetDefaultIpAny();
+}
+
+
PIPSocket::Address PIPSocket::GetGatewayInterfaceAddress()
{
PWaitAndSignal m(GetSNMPMutex());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-10-23 05:44:00
|
Revision: 18752
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18752&view=rev
Author: rjongbloed
Date: 2007-10-22 22:44:04 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Applied OpenH323 patch 1703663
Hide control window in service simulation mode.
Thanks Fabrizio Ammollo (fammollo)
Modified Paths:
--------------
ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h
ptlib/trunk/src/ptlib/msos/svcproc.cxx
Modified: ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h 2007-10-23 05:36:42 UTC (rev 18751)
+++ ptlib/trunk/include/ptlib/msos/ptlib/svcproc.h 2007-10-23 05:44:04 UTC (rev 18752)
@@ -142,6 +142,7 @@
protected:
PCaselessString systemLogFileName;
+ BOOL debugHidden; /// Flag to indicate service is run in simulation mode without showing the control window
private:
static void __stdcall StaticMainEntry(DWORD argc, LPTSTR * argv);
Modified: ptlib/trunk/src/ptlib/msos/svcproc.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/svcproc.cxx 2007-10-23 05:36:42 UTC (rev 18751)
+++ ptlib/trunk/src/ptlib/msos/svcproc.cxx 2007-10-23 05:44:04 UTC (rev 18752)
@@ -708,6 +708,9 @@
debugMode = arguments.GetCount() > 0 &&
(strcasecmp(arguments[0], "Debug") == 0 || strcasecmp(arguments[0], "foreground") == 0);
+ debugHidden = arguments.GetCount() > 0 && strcasecmp(arguments[0], "DebugHidden") == 0;
+ if (debugHidden)
+ debugMode=TRUE;
currentLogLevel = debugMode ? PSystemLog::Info : PSystemLog::Warning;
if (!debugMode && arguments.GetCount() > 0) {
@@ -1269,7 +1272,7 @@
}
- if (!IsWindowVisible(controlWindow))
+ if (!IsWindowVisible(controlWindow) && !debugHidden)
ShowWindow(controlWindow, SW_SHOWDEFAULT);
int len = strlen(out);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-10-23 07:29:22
|
Revision: 18757
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18757&view=rev
Author: rjongbloed
Date: 2007-10-23 00:29:26 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Applied OpenH323 patch 1240291
Select() on the same socket from multiple threads (simul read/write)
Thanks Boris Pavacic - bpavacic
Modified Paths:
--------------
ptlib/trunk/include/ptlib/unix/ptlib/channel.h
ptlib/trunk/src/ptlib/unix/channel.cxx
ptlib/trunk/src/ptlib/unix/socket.cxx
Modified: ptlib/trunk/include/ptlib/unix/ptlib/channel.h
===================================================================
--- ptlib/trunk/include/ptlib/unix/ptlib/channel.h 2007-10-23 07:04:58 UTC (rev 18756)
+++ ptlib/trunk/include/ptlib/unix/ptlib/channel.h 2007-10-23 07:29:26 UTC (rev 18757)
@@ -128,8 +128,8 @@
PThread * px_readThread;
PThread * px_writeThread;
PMutex px_writeMutex;
- PThread * px_selectThread;
- PMutex px_selectMutex;
+ PThread * px_selectThread[3];
+ PMutex px_selectMutex[3];
#endif //#ifndef __PCHANNEL_UNIX__
Modified: ptlib/trunk/src/ptlib/unix/channel.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/channel.cxx 2007-10-23 07:04:58 UTC (rev 18756)
+++ ptlib/trunk/src/ptlib/unix/channel.cxx 2007-10-23 07:29:26 UTC (rev 18757)
@@ -182,7 +182,9 @@
px_lastBlockType = PXReadBlock;
px_readThread = NULL;
px_writeThread = NULL;
- px_selectThread = NULL;
+ px_selectThread[0] = NULL;
+ px_selectThread[1] = NULL;
+ px_selectThread[2] = NULL;
}
@@ -414,7 +416,9 @@
AbortIO(px_readThread, px_threadMutex);
AbortIO(px_writeThread, px_threadMutex);
- AbortIO(px_selectThread, px_threadMutex);
+ AbortIO(px_selectThread[0], px_threadMutex);
+ AbortIO(px_selectThread[1], px_threadMutex);
+ AbortIO(px_selectThread[2], px_threadMutex);
int stat;
do {
Modified: ptlib/trunk/src/ptlib/unix/socket.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/socket.cxx 2007-10-23 07:04:58 UTC (rev 18756)
+++ ptlib/trunk/src/ptlib/unix/socket.cxx 2007-10-23 07:29:26 UTC (rev 18757)
@@ -552,8 +552,8 @@
if (h > maxfds)
maxfds = h;
}
- socket.px_selectMutex.Wait();
- socket.px_selectThread = unblockThread;
+ socket.px_selectMutex[i].Wait();
+ socket.px_selectThread[i] = unblockThread;
}
}
@@ -572,8 +572,8 @@
for (i = 0; i < 3; i++) {
for (j = 0; j < list[i]->GetSize(); j++) {
PSocket & socket = (*list[i])[j];
- socket.px_selectThread = NULL;
- socket.px_selectMutex.Signal();
+ socket.px_selectThread[i] = NULL;
+ socket.px_selectMutex[i].Signal();
if (lastError == NoError) {
int h = socket.GetHandle();
if (h < 0)
@@ -614,8 +614,8 @@
if (h > maxfds)
maxfds = h;
}
- socket.px_selectMutex.Wait();
- socket.px_selectThread = unblockThread;
+ socket.px_selectMutex[i].Wait();
+ socket.px_selectThread[i] = unblockThread;
}
}
@@ -644,8 +644,8 @@
for (i = 0; i < 3; i++) {
for (j = 0; j < list[i]->GetSize(); j++) {
PSocket & socket = (*list[i])[j];
- socket.px_selectThread = NULL;
- socket.px_selectMutex.Signal();
+ socket.px_selectThread[i] = NULL;
+ socket.px_selectMutex[i].Signal();
if (lastError == NoError) {
int h = socket.GetHandle();
if (h < 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2007-10-24 21:02:36
|
Revision: 18762
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18762&view=rev
Author: shorne
Date: 2007-10-24 14:02:32 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Added GetDeviceCapabilities to all plugins
Modified Paths:
--------------
ptlib/trunk/include/ptclib/pvfiledev.h
ptlib/trunk/include/ptlib/plugin.h
ptlib/trunk/include/ptlib/pluginmgr.h
ptlib/trunk/include/ptlib/videoio.h
ptlib/trunk/src/ptlib/common/pluginmgr.cxx
ptlib/trunk/src/ptlib/common/vfakeio.cxx
ptlib/trunk/src/ptlib/common/videoio.cxx
ptlib/trunk/src/ptlib/msos/vfw.cxx
Modified: ptlib/trunk/include/ptclib/pvfiledev.h
===================================================================
--- ptlib/trunk/include/ptclib/pvfiledev.h 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptclib/pvfiledev.h 2007-10-24 21:02:32 UTC (rev 18762)
@@ -156,7 +156,7 @@
*/
static BOOL GetDeviceCapabilities(
const PString & /*deviceName*/, ///< Name of device
- InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
+ InputDeviceCapabilities * /*caps*/ ///< List of supported capabilities
) { return FALSE; }
/**Get the maximum frame size in bytes.
Modified: ptlib/trunk/include/ptlib/plugin.h
===================================================================
--- ptlib/trunk/include/ptlib/plugin.h 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptlib/plugin.h 2007-10-24 21:02:32 UTC (rev 18762)
@@ -169,6 +169,8 @@
virtual PObject * CreateInstance(int userData) const = 0;
virtual PStringList GetDeviceNames(int userData) const = 0;
virtual bool ValidateDeviceName(const PString & deviceName, int userData) const;
+ virtual bool GetDeviceCapabilities(const PString & deviceName,
+ void * capabilities) const;
};
Modified: ptlib/trunk/include/ptlib/pluginmgr.h
===================================================================
--- ptlib/trunk/include/ptlib/pluginmgr.h 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptlib/pluginmgr.h 2007-10-24 21:02:32 UTC (rev 18762)
@@ -151,6 +151,7 @@
PObject * CreatePluginsDevice(const PString & serviceName, const PString & serviceType, int userData = 0) const;
PObject * CreatePluginsDeviceByName(const PString & deviceName, const PString & serviceType, int userData = 0, const PString & serviceName = PString::Empty()) const;
PStringList GetPluginsDeviceNames(const PString & serviceName, const PString & serviceType, int userData = 0) const;
+ BOOL GetPluginsDeviceCapabilities(const PString & serviceType,const PString & serviceName,const PString & deviceName,void * capabilities) const;
// function to register a service (used by the plugins themselves)
BOOL RegisterService (const PString & serviceName, const PString & serviceType, PPluginServiceDescriptor * descriptor);
Modified: ptlib/trunk/include/ptlib/videoio.h
===================================================================
--- ptlib/trunk/include/ptlib/videoio.h 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/include/ptlib/videoio.h 2007-10-24 21:02:32 UTC (rev 18762)
@@ -1048,10 +1048,20 @@
/**Retrieve a list of Device Capabilities
*/
static BOOL GetDeviceCapabilities(
- const PString & /*deviceName*/, ///< Name of device
- InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
- ) { return FALSE; }
+ const PString & deviceName, ///< Name of device
+ InputDeviceCapabilities * caps, ///< List of supported capabilities
+ PPluginManager * pluginMgr = NULL ///< Plug in manager, use default if NULL
+ );
+ /**Retrieve a list of Device Capabilities for a particular driver
+ */
+ static BOOL GetDeviceCapabilities(
+ const PString & deviceName, ///< Name of device
+ const PString & driverName, ///< Device Driver
+ InputDeviceCapabilities * caps, ///< List of supported capabilities
+ PPluginManager * pluginMgr = NULL ///< Plug in manager, use default if NULL
+ );
+
/**Open the device given the device name.
*/
virtual BOOL Open(
@@ -1106,8 +1116,8 @@
public:
virtual PObject * CreateInstance(int /*userData*/) const { return new className; }
virtual PStringList GetDeviceNames(int /*userData*/) const { return className::GetInputDeviceNames(); }
- virtual BOOL GetDeviceCapabilities(const PString & deviceName, InputDeviceCapabilities & caps) const
- { return className::GetDeviceCapabilities(deviceName,caps); }
+ virtual bool GetDeviceCapabilities(const PString & deviceName, void * caps) const
+ { return className::GetDeviceCapabilities(deviceName,(InputDeviceCapabilities *)caps); }
};
#define PCREATE_VIDINPUT_PLUGIN(name) \
Modified: ptlib/trunk/src/ptlib/common/pluginmgr.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/pluginmgr.cxx 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/common/pluginmgr.cxx 2007-10-24 21:02:32 UTC (rev 18762)
@@ -418,7 +418,13 @@
return false;
}
+bool PDevicePluginServiceDescriptor::GetDeviceCapabilities(const PString & /*deviceName*/,
+ void * /*capabilities*/) const
+{
+ return false;
+}
+
PStringList PPluginManager::GetPluginsDeviceNames(const PString & serviceName,
const PString & serviceType,
int userData) const
@@ -469,7 +475,32 @@
return allDevices;
}
+BOOL PPluginManager::GetPluginsDeviceCapabilities(const PString & serviceType,
+ const PString & serviceName,
+ const PString & deviceName,
+ void * capabilities) const
+{
+ if (serviceType.IsEmpty() || deviceName.IsEmpty())
+ return FALSE;
+ if (serviceName.IsEmpty() || serviceName == "*") {
+ for (PINDEX i = 0; i < serviceList.GetSize(); i++) {
+ const PPluginService & service = serviceList[i];
+ if (service.serviceType *= serviceType) {
+ PDevicePluginServiceDescriptor * desc = (PDevicePluginServiceDescriptor *)service.descriptor;
+ if (desc != NULL && desc->ValidateDeviceName(deviceName, 0))
+ return desc->GetDeviceCapabilities(deviceName,capabilities);
+ }
+ }
+ } else {
+ PDevicePluginServiceDescriptor * desc = (PDevicePluginServiceDescriptor *)GetServiceDescriptor(serviceName, serviceType);
+ if (desc != NULL && desc->ValidateDeviceName(deviceName, 0))
+ return desc->GetDeviceCapabilities(deviceName,capabilities);
+ }
+
+ return FALSE;
+}
+
BOOL PPluginManager::RegisterService(const PString & serviceName,
const PString & serviceType,
PPluginServiceDescriptor * descriptor)
Modified: ptlib/trunk/src/ptlib/common/vfakeio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/vfakeio.cxx 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/common/vfakeio.cxx 2007-10-24 21:02:32 UTC (rev 18762)
@@ -1492,7 +1492,7 @@
*/
static BOOL GetDeviceCapabilities(
const PString & /*deviceName*/, ///< Name of device
- InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
+ InputDeviceCapabilities * /*caps*/ ///< List of supported capabilities
) { return FALSE; }
/**Get the maximum frame size in bytes.
Modified: ptlib/trunk/src/ptlib/common/videoio.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/videoio.cxx 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/common/videoio.cxx 2007-10-24 21:02:32 UTC (rev 18762)
@@ -1193,7 +1193,7 @@
colourFormat = "RGB24";
bytesPerPixel = 3;
swappedRedAndBlue = false;
- SetFrameSize(frameWidth, frameHeight);
+// SetFrameSize(frameWidth, frameHeight);
}
@@ -1202,22 +1202,22 @@
PWaitAndSignal m(mutex);
PINDEX newBytesPerPixel;
- bool newSwappedRedAndBlue;
+
if (colourFormat *= "RGB32") {
newBytesPerPixel = 4;
- newSwappedRedAndBlue = false;
+ swappedRedAndBlue = false;
}
else if (colourFormat *= "RGB24") {
newBytesPerPixel = 3;
- newSwappedRedAndBlue = false;
+ swappedRedAndBlue = false;
}
else if (colourFormat *= "BGR32") {
newBytesPerPixel = 4;
- newSwappedRedAndBlue = true;
+ swappedRedAndBlue = true;
}
else if (colourFormat *= "BGR24") {
newBytesPerPixel = 3;
- newSwappedRedAndBlue = true;
+ swappedRedAndBlue = true;
}
else
return FALSE;
@@ -1408,7 +1408,21 @@
return (PVideoInputDevice *)pluginMgr->CreatePluginsDeviceByName(deviceName, videoInputPluginBaseClass,0,driverName);
}
+BOOL PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName,InputDeviceCapabilities * caps, PPluginManager * pluginMgr)
+{
+ return GetDeviceCapabilities(deviceName, "*",caps,pluginMgr);
+}
+BOOL PVideoInputDevice::GetDeviceCapabilities(const PString & deviceName,const PString & driverName, InputDeviceCapabilities * caps, PPluginManager * pluginMgr)
+{
+ if (pluginMgr == NULL)
+ pluginMgr = &PPluginManager::GetPluginManager();
+
+ return pluginMgr->GetPluginsDeviceCapabilities(videoInputPluginBaseClass,driverName,deviceName, (void *)caps);
+}
+
+
+
PVideoInputDevice * PVideoInputDevice::CreateOpenedDevice(const PString & driverName,
const PString & deviceName,
BOOL startImmediate,
@@ -1442,7 +1456,6 @@
return NULL;
}
-
BOOL PVideoInputDevice::GetFrame(PBYTEArray & frame)
{
PINDEX returned;
Modified: ptlib/trunk/src/ptlib/msos/vfw.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vfw.cxx 2007-10-24 07:12:26 UTC (rev 18761)
+++ ptlib/trunk/src/ptlib/msos/vfw.cxx 2007-10-24 21:02:32 UTC (rev 18762)
@@ -393,7 +393,7 @@
*/
static BOOL GetDeviceCapabilities(
const PString & /*deviceName*/, ///< Name of device
- InputDeviceCapabilities & /*caps*/ ///< List of supported capabilities
+ InputDeviceCapabilities * /*caps*/ ///< List of supported capabilities
) { return FALSE; }
/**Open the device given the device name.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cso...@us...> - 2007-11-04 11:05:33
|
Revision: 18789
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18789&view=rev
Author: csoutheren
Date: 2007-11-04 03:05:34 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
Use inet_ntop when available
Use PCriticalSection on inet_ntoa
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/src/ptlib/common/sockets.cxx
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/configure 2007-11-04 11:05:34 UTC (rev 18789)
@@ -7874,11 +7874,72 @@
fi
HAS_IPV6=
+HAS_INET_NTOP=
if test "$enable_ipv6" = "no" ; then
{ echo "$as_me:$LINENO: IPV6 disabled" >&5
echo "$as_me: IPV6 disabled" >&6;}
+ echo "$as_me:$LINENO: checking for inet_ntop" >&5
+echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+int
+main ()
+{
+int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ HAS_INET_NTOP=yes
else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+HAS_INET_NTOP=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $HAS_INET_NTOP = no ; then
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ else
+ cat >>confdefs.h <<\_ACEOF
+#define P_HAS_INET_NTOP 1
+_ACEOF
+
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ fi
+else
echo "$as_me:$LINENO: checking for IPv6 support" >&5
echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/configure.ac 2007-11-04 11:05:34 UTC (rev 18789)
@@ -1582,9 +1582,21 @@
fi
HAS_IPV6=
+HAS_INET_NTOP=
if test "$enable_ipv6" = "no" ; then
AC_MSG_NOTICE(IPV6 disabled)
+ AC_MSG_CHECKING(for inet_ntop)
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>],
+ [int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);], HAS_INET_NTOP=yes, HAS_INET_NTOP=no)
+ if test $HAS_INET_NTOP = no ; then
+ AC_MSG_RESULT(no)
+ else
+ AC_DEFINE(P_HAS_INET_NTOP, 1)
+ AC_MSG_RESULT(yes)
+ fi
else
AC_MSG_CHECKING(for IPv6 support)
AC_TRY_COMPILE([#include <sys/types.h>
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/include/ptbuildopts.h.in 2007-11-04 11:05:34 UTC (rev 18789)
@@ -772,6 +772,7 @@
#undef PMEMORY_CHECK
#undef P_HAS_RECVMSG
#undef P_HAS_UPAD128_T
+#undef P_HAS_INET_NTOP
#endif // _PT_BUILDOPTS_H
Modified: ptlib/trunk/src/ptlib/common/sockets.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/sockets.cxx 2007-11-04 10:10:22 UTC (rev 18788)
+++ ptlib/trunk/src/ptlib/common/sockets.cxx 2007-11-04 11:05:34 UTC (rev 18789)
@@ -2520,14 +2520,24 @@
str.MakeMinimumSize();
return str;
}
-#endif
-#ifdef P_VXWORKS
+
+#elif defined(P_VXWORKS)
char ipStorage[INET_ADDR_LEN];
inet_ntoa_b(v.four, ipStorage);
return ipStorage;
-#else // P_VXWORKS
+
+#elif defined(P_HAS_INET_NTOP)
+ static PCriticalSection m;
return inet_ntoa(v.four);
-#endif // P_VXWORKS
+
+#else
+
+ PString str;
+ if (inet_ntop(AF_INET, sa, str.GetPointer(INET_ADDRSTRLEN), INET_ADDRSTRLEN) == NULL)
+ return PString::Empty()
+ return str;
+
+#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cso...@us...> - 2007-11-04 12:01:47
|
Revision: 18792
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18792&view=rev
Author: csoutheren
Date: 2007-11-04 04:01:51 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
Allow SNMP and HTTPSVC to be disabled on Windows builds
Modified Paths:
--------------
ptlib/trunk/configure.ac
ptlib/trunk/include/ptclib/http.h
ptlib/trunk/include/ptclib/httpform.h
ptlib/trunk/src/ptclib/httpsrvr.cxx
ptlib/trunk/src/ptclib/httpsvc.cxx
ptlib/trunk/src/ptclib/psnmp.cxx
ptlib/trunk/src/ptclib/shttpsvc.cxx
ptlib/trunk/src/ptclib/snmpclnt.cxx
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/configure.ac 2007-11-04 12:01:51 UTC (rev 18792)
@@ -2064,6 +2064,7 @@
dnl MSWIN_DISPLAY httpsvc,HTTP service Support
dnl MSWIN_DEFINE httpsvc,P_HTTPSVC
+dnl MSWIN_IF_FEATURE httpsvc,!http
AC_ARG_ENABLE(httpsvc,
[ --disable-httpsvc disable HTTP service support])
Modified: ptlib/trunk/include/ptclib/http.h
===================================================================
--- ptlib/trunk/include/ptclib/http.h 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/include/ptclib/http.h 2007-11-04 12:01:51 UTC (rev 18792)
@@ -246,8 +246,6 @@
#include <ptlib/ipsock.h>
-#ifdef P_HTTPSVC
-
#include <ptclib/html.h>
//////////////////////////////////////////////////////////////////////////////
@@ -355,8 +353,6 @@
BOOL SetSize(PINDEX) { return FALSE; }
};
-#endif // P_HTTPSVC
-
#ifdef _WIN32_WCE
#undef TRACE
#endif
@@ -634,8 +630,6 @@
PString userAgentName;
};
-#ifdef P_HTTPSVC
-
//////////////////////////////////////////////////////////////////////////////
// PMultipartFormInfo
@@ -1904,9 +1898,7 @@
PFilePath realPath;
};
-#endif // P_HTTPSVC
+#endif // _PHTTP
-#endif
-
// End Of File ///////////////////////////////////////////////////////////////
Modified: ptlib/trunk/include/ptclib/httpform.h
===================================================================
--- ptlib/trunk/include/ptclib/httpform.h 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/include/ptclib/httpform.h 2007-11-04 12:01:51 UTC (rev 18792)
@@ -90,6 +90,7 @@
#endif
#include <ptclib/http.h>
+#include <ptclib/html.h>
///////////////////////////////////////////////////////////////////////////////
Modified: ptlib/trunk/src/ptclib/httpsrvr.cxx
===================================================================
--- ptlib/trunk/src/ptclib/httpsrvr.cxx 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/httpsrvr.cxx 2007-11-04 12:01:51 UTC (rev 18792)
@@ -186,6 +186,7 @@
*/
#include <ptlib.h>
+#include <ptbuildopts.h>
#ifdef P_HTTP
Modified: ptlib/trunk/src/ptclib/httpsvc.cxx
===================================================================
--- ptlib/trunk/src/ptclib/httpsvc.cxx 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/httpsvc.cxx 2007-11-04 12:01:51 UTC (rev 18792)
@@ -345,6 +345,10 @@
#endif
#include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_HTTPSVC
+
#include <ptclib/httpsvc.h>
#include <ptlib/sockets.h>
@@ -2055,5 +2059,6 @@
return TRUE;
}
+#endif // P_HTTPSVC
///////////////////////////////////////////////////////////////////
Modified: ptlib/trunk/src/ptclib/psnmp.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psnmp.cxx 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/psnmp.cxx 2007-11-04 12:01:51 UTC (rev 18792)
@@ -83,6 +83,9 @@
#endif
#include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_SNMP
#include <ptclib/psnmp.h>
#define new PNEW
@@ -192,5 +195,6 @@
return SnmpErrorCodeTable[err];
}
+#endif // P_SNMP
// End Of File ///////////////////////////////////////////////////////////////
Modified: ptlib/trunk/src/ptclib/shttpsvc.cxx
===================================================================
--- ptlib/trunk/src/ptclib/shttpsvc.cxx 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/shttpsvc.cxx 2007-11-04 12:01:51 UTC (rev 18792)
@@ -65,15 +65,17 @@
*
*/
-#include <ptlib.h>
-
#ifdef __GNUC__
#pragma implementation "shttpsvc.h"
#endif
+#include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_HTTPSVC
+
#include <ptclib/shttpsvc.h>
-
#ifdef P_SSL
class HTTP_PSSLChannel : public PSSLChannel
@@ -270,4 +272,6 @@
#endif //P_SSL
+#endif // P_HTTPSVC
+
// End Of File ///////////////////////////////////////////////////////////////
Modified: ptlib/trunk/src/ptclib/snmpclnt.cxx
===================================================================
--- ptlib/trunk/src/ptclib/snmpclnt.cxx 2007-11-04 11:39:45 UTC (rev 18791)
+++ ptlib/trunk/src/ptclib/snmpclnt.cxx 2007-11-04 12:01:51 UTC (rev 18792)
@@ -57,6 +57,10 @@
*/
#include <ptlib.h>
+#include <ptbuildopts.h>
+
+#ifdef P_SNMP
+
#include <ptclib/psnmp.h>
#define new PNEW
@@ -496,5 +500,6 @@
channel.Write(sendBuffer, sendBuffer.GetSize());
}
+#endif // P_SNMP
// End Of File ///////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dsa...@us...> - 2007-11-04 20:31:28
|
Revision: 18793
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18793&view=rev
Author: dsandras
Date: 2007-11-04 12:31:31 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
Fixed Mingw compilation thanks to Matthias Schneider <ma30002000 yahoo de>.
Many thanks!
Modified Paths:
--------------
ptlib/trunk/include/ptclib/pdns.h
ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
Modified: ptlib/trunk/include/ptclib/pdns.h
===================================================================
--- ptlib/trunk/include/ptclib/pdns.h 2007-11-04 12:01:51 UTC (rev 18792)
+++ ptlib/trunk/include/ptclib/pdns.h 2007-11-04 20:31:31 UTC (rev 18793)
@@ -89,9 +89,11 @@
# pragma comment(lib, P_DNS_LIBRARY)
// Accommodate spelling error in windns.h
+#ifndef __MINGW32__
enum { DnsSectionAdditional = DnsSectionAddtional };
+#endif
-#else
+#else /* WIN32 */
# define P_HAS_RESOLVER 1 // set if using Unix-style DNS routines
# include <arpa/nameser.h>
Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h 2007-11-04 12:01:51 UTC (rev 18792)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h 2007-11-04 20:31:31 UTC (rev 18793)
@@ -118,7 +118,7 @@
*/
static BOOL GetDeviceCapabilities(
const PString & deviceName, ///< Name of device
- InputDeviceCapabilities & caps ///< List of supported capabilities
+ InputDeviceCapabilities * caps ///< List of supported capabilities
);
Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2007-11-04 12:01:51 UTC (rev 18792)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2007-11-04 20:31:31 UTC (rev 18793)
@@ -1038,7 +1038,7 @@
}
-BOOL PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities & /*caps*/)
+BOOL PVideoInputDevice_DirectShow::GetDeviceCapabilities(const PString & /*deviceName*/,InputDeviceCapabilities * /*caps*/)
{
// To do!
return FALSE;
@@ -1338,7 +1338,7 @@
}
-struct {
+const static struct {
char *pwlib_format;
GUID media_format;
} formats[] =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sh...@us...> - 2007-11-05 08:58:18
|
Revision: 18810
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18810&view=rev
Author: shorne
Date: 2007-11-05 00:58:23 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
added windows application video Input
Modified Paths:
--------------
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/src/ptlib/msos/Console.vcproj
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2007-11-05 08:57:51 UTC (rev 18809)
+++ ptlib/trunk/configure.ac 2007-11-05 08:58:23 UTC (rev 18810)
@@ -2155,6 +2155,33 @@
AC_SUBST(HAS_VIDFILE)
dnl ########################################################################
+dnl check for enabling app share support
+
+dnl MSWIN_DISPLAY appshare,Application share support
+dnl MSWIN_DEFINE appshare,P_APPSHARE
+
+if test "$HAS_VIDEO" \!= "1" ; then
+ default_appshare=no
+fi
+
+AC_ARG_ENABLE(vidfile,
+ [ --enable-appshare enable Application share support])
+
+if test "${enable_appshare}z" = "z" ; then
+ enable_vidfile=$default_appshare
+fi
+
+HAS_APPSHARE=
+if test "$enable_appshare" = "no" ; then
+ AC_MSG_NOTICE(Application share support disabled)
+else
+ AC_MSG_NOTICE(Application share enabled)
+ HAS_APPSHARE=1
+ AC_DEFINE(P_APPSHARE, 1)
+fi
+AC_SUBST(HAS_APPSHARE)
+
+dnl ########################################################################
dnl check for sound support
dnl MSWIN_DISPLAY audio,Sound support
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2007-11-05 08:57:51 UTC (rev 18809)
+++ ptlib/trunk/include/ptbuildopts.h.in 2007-11-05 08:58:23 UTC (rev 18810)
@@ -649,7 +649,16 @@
#endif
+/////////////////////////////////////////////////
+//
+// APP Share Input
+//
+#undef P_APPSHARE
+#if defined(_MSC_VER) && P_APPSHARE
+#pragma include_alias(<ptlib/vidinput_app.h>, <ptlib/msos/ptlib/vidinput_app.h>)
+#endif
+
/////////////////////////////////////////////////
//
// Runtime dynamic link libraries
Modified: ptlib/trunk/src/ptlib/msos/Console.vcproj
===================================================================
--- ptlib/trunk/src/ptlib/msos/Console.vcproj 2007-11-05 08:57:51 UTC (rev 18809)
+++ ptlib/trunk/src/ptlib/msos/Console.vcproj 2007-11-05 08:58:23 UTC (rev 18810)
@@ -1,2099 +1,2105 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="PTLib Static"
- ProjectGUID="{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="..\..\..\Lib"
- IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\include"
- PreprocessorDefinitions="_DEBUG;_LIB;PTRACING=1"
- RuntimeLibrary="3"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="ptlib.h"
- ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
- BrowseInformation="1"
- WarningLevel="4"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\ptlibsd.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="3081"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="..\..\..\Lib"
- IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\include"
- PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=1"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="ptlib.h"
- ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
- WarningLevel="4"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\ptlibs.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="3081"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="No Trace|Win32"
- OutputDirectory="..\..\..\Lib"
- IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\..\include"
- PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=0"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="3"
- PrecompiledHeaderThrough="ptlib.h"
- ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
- WarningLevel="4"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile="$(OutDir)\ptlibsn.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="3081"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">
- <File
- RelativePath="..\..\ptclib\asnber.cxx">
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\asner.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\asnper.cxx">
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\asnxer.cxx">
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32"
- ExcludedFromBuild="TRUE">
- <Tool
- Name="VCCLCompilerTool"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="assert.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="1"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\collect.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\contain.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\cypher.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\delaychan.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\dtmf.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\enum.cxx">
- </File>
- <File
- RelativePath="ethsock.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\ftp.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\ftpclnt.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\ftpsrvr.cxx">
- </File>
- <File
- RelativePath="..\common\getdate.y">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
-"
- Outputs="../common/getdate_tab.c"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
-"
- Outputs="../common/getdate_tab.c"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="bison -o ../common/getdate_tab.c ../common/getdate.y
-"
- Outputs="../common/getdate_tab.c"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\getdate_tab.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\guid.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\html.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\http.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\httpclnt.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\httpform.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\httpsrvr.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\httpsvc.cxx">
- </File>
- <File
- RelativePath="icmp.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\inetmail.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\inetprot.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\ipacl.cxx">
- </File>
- <File
- RelativePath="mail.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\memfile.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\modem.cxx">
- </File>
- <File
- RelativePath="..\common\notifier_ext.cxx">
- </File>
- <File
- RelativePath="..\common\object.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\osutils.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\pasn.cxx">
- </File>
- <File
- RelativePath="..\Common\pchannel.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\Common\pconfig.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\pdns.cxx">
- </File>
- <File
- RelativePath="..\common\pethsock.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\pils.cxx">
- </File>
- <File
- RelativePath="pipe.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\pipechan.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\pldap.cxx">
- </File>
- <File
- RelativePath="..\common\pluginmgr.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\pnat.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\podbc.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\psasl.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\psnmp.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\psoap.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\psockbun.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\pssl.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\pstun.cxx">
- </File>
- <File
- RelativePath="..\common\ptime.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="ptlib.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\ptts.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\pvfiledev.cxx">
- </File>
- <File
- RelativePath="..\common\pvidchan.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\pvidfile.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\pwavfile.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\pwavfiledev.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\pxml.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\pxmlrpc.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\pxmlrpcs.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\qchannel.cxx">
- </File>
- <File
- RelativePath="..\common\qos.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\random.cxx">
- </File>
- <File
- RelativePath="remconn.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\rfc1155.cxx">
- </File>
- <File
- RelativePath="..\common\safecoll.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\Common\serial.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\sfile.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\shttpsvc.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\snmp.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\snmpclnt.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\snmpserv.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\sockagg.cxx">
- </File>
- <File
- RelativePath="..\common\sockets.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\socks.cxx">
- </File>
- <File
- RelativePath="..\common\sound.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\sound_directsound.cxx">
- </File>
- <File
- RelativePath="sound_win32.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="svcproc.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\telnet.cxx">
- </File>
- <File
- RelativePath="..\common\vconvert.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\vfakeio.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="vfw.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\videoio.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\vsdl.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\vxml.cxx">
- </File>
- <File
- RelativePath="win32.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="wincfg.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="winserial.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="winsock.cxx">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\ptclib\xmpp.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\xmpp_c2s.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\xmpp_muc.cxx">
- </File>
- <File
- RelativePath="..\..\ptclib\xmpp_roster.cxx">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd">
- <File
- RelativePath="..\..\..\include\ptbuildopts.h">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCustomBuildTool"
- CommandLine=""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\include\ptbuildopts.h.in">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Configuring Build Options"
- CommandLine="cd ..\..\..
-configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
-"
- Outputs="$(InputDir)ptbuildopts.h"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Configuring Build Options"
- CommandLine="cd ..\..\..
-configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
-"
- AdditionalDependencies="..\..\..\configure.ac"
- Outputs="$(InputDir)ptbuildopts.h"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCustomBuildTool"
- Description="Configuring Build Options"
- CommandLine="cd ..\..\..
-configure --exclude-env=VSNET_PWLIB_CONFIGURE_EXCLUDE_DIRS %PWLIB_CONFIGURE_OPTIONS%
-"
- AdditionalDependencies="..\..\..\configure.ac"
- Outputs="$(InputDir)ptbuildopts.h"/>
- </FileConfiguration>
- </File>
- <Filter
- Name="Common"
- Filter="">
- <File
- RelativePath="..\..\..\Include\PtLib\Args.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Array.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\asnber.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\asner.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\asnper.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\asnxer.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Channel.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Config.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Contain.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\critsec.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\cypher.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\delaychan.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Dict.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\dtmf.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Dynalink.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\enum.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Ethsock.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\File.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\filepath.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\ftp.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\guid.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\html.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\http.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\httpform.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\httpsvc.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Icmpsock.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Indchan.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\inetmail.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\inetprot.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\ipacl.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Ipdsock.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\ipsock.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\ipxsock.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Lists.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Mail.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\memfile.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\mime.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\modem.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\mutex.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\notifier.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\notifier_ext.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\object.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pasn.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Pdirect.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pdns.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\pfactory.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pils.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Pipechan.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pldap.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\plugin.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\pluginmgr.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\podbc.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\pprocess.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\psasl.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\psnmp.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\psoap.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\psockbun.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pssl.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Pstring.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pstun.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\psync.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Ptime.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\ptts.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pvfiledev.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pvidfile.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pwavfile.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pwavfiledev.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pxml.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pxmlrpc.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\pxmlrpcs.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\qchannel.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\random.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Remconn.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\rfc1155.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\safecoll.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\semaphor.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Serchan.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Sfile.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\shttpsvc.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\snmp.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\sockagg.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\socket.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\sockets.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\socks.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Sound.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\spxsock.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Svcproc.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\syncpoint.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\syncthrd.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Tcpsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\telnet.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Textfile.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\thread.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Timeint.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Timer.h">
- </File>
- <File
- RelativePath="..\..\..\Include\PtLib\Udpsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\url.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\vconvert.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\videoio.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\vsdl.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\vxml.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\xmpp.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\xmpp_c2s.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\xmpp_muc.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptclib\xmpp_roster.h">
- </File>
- </Filter>
- <Filter
- Name="MSOS"
- Filter="">
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\channel.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\config.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\contain.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\critsec.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\debstrm.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\dynalink.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\epacket.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\ethsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\file.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\filepath.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\icmpsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\ipdsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\ipsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\ipxsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\mail.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\mutex.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\pdirect.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\pipechan.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\pprocess.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\ptime.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\remconn.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\semaphor.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\serchan.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\sfile.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\socket.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\sound_directsound.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\spxsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\svcproc.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\syncpoint.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\tcpsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\textfile.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\thread.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\timeint.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\timer.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\udpsock.h">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\videoio.h">
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="Inlines"
- Filter=".inl">
- <File
- RelativePath="..\..\..\include\ptlib\contain.inl">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\osutil.inl">
- </File>
- <File
- RelativePath="..\..\..\include\ptlib\msos\ptlib\ptlib.inl">
- </File>
- </Filter>
- <Filter
- Name="Regex"
- Filter="">
- <File
- RelativePath="..\common\regex\regcomp.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\regex\regerror.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\regex\regexec.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\common\regex\regfree.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="No Trace|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\common\regex"
- PreprocessorDefinitions=""
- UsePrecompiledHeader="0"
- WarningLevel="1"/>
- </FileConfiguration>
- </File>
- </Filter>
- <File
- RelativePath="..\..\..\configure.ac">
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="PTLib Static"
+ ProjectGUID="{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\..\..\Lib"
+ IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\include"
+ PreprocessorDefinitions="_DEBUG;_LIB;PTRACING=1"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="3"
+ PrecompiledHeaderThrough="ptlib.h"
+ ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
+ BrowseInformation="1"
+ WarningLevel="4"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\ptlibsd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="3081"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\..\..\Lib"
+ IntermediateDirectory="..\..\..\Lib\$(ConfigurationName)"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="2"
+ AdditionalIncludeDirectories="..\..\..\include"
+ PreprocessorDefinitions="NDEBUG;_LIB;PTRACING=1"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="3"
+ PrecompiledHeaderThrough="ptlib.h"
+ ProgramDataBaseFileName="$(IntDir)\$(TargetName).pdb"
+ WarningLevel="4"
+ SuppressStartupBanne...
[truncated message content] |
|
From: <cso...@us...> - 2007-11-05 12:23:09
|
Revision: 18815
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18815&view=rev
Author: csoutheren
Date: 2007-11-05 04:23:10 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
Fix problem with inet_ntop addition
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/src/ptlib/common/sockets.cxx
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2007-11-05 12:22:36 UTC (rev 18814)
+++ ptlib/trunk/configure 2007-11-05 12:23:10 UTC (rev 18815)
@@ -310,7 +310,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PTLIBDIR PTINSTDIR INSTALLPREFIX LIBDIR MAJOR_VERSION MINOR_VERSION BUILD_NUMBER PTLIB_VERSION BUILD_TYPE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHTYPE OSTYPE OSRELEASE TARGETDIR USE_GCC USE_PCH SHAREDLIBEXT CXXCPP EGREP FLEX AR BISON HAS_REGEX HAS_PLUGINS HAS_RESOLVER HAS_SASL HAS_SASL2 HAS_OPENLDAP HAS_OPENSSL P_STATIC_ENDLDLIBS P_STATIC_LDFLAGS HAS_EXPAT HAS_VXML HAS_JABBER HAS_XMLRPC HAS_SOAP HAS_TTS HAS_IPV6 HAS_SDL HAS_VIDEO HAS_VIDEO_CAPTURE USE_SHM_VIDEO_DEVICES HAS_ASN HAS_STUN HAS_PIPECHAN HAS_DTMF HAS_WAVFILE HAS_SOCKS HAS_FTP HAS_SNMP HAS_TELNET HAS_REMCONN HAS_SERIAL HAS_POP3SMTP HAS_HTTP HAS_HTTPSVC HAS_CONFIG_FILE HAS_SOCKAGG HAS_VIDFILE HAS_AUDIO HAS_OSS HAS_ALSA HAS_ODBC STDCCFLAGS STDCXXFLAGS OPTSTDCCFLAGS ENDLDLIBS DEBUG_FLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PTLIBDIR PTINSTDIR INSTALLPREFIX LIBDIR MAJOR_VERSION MINOR_VERSION BUILD_NUMBER PTLIB_VERSION BUILD_TYPE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHTYPE OSTYPE OSRELEASE TARGETDIR USE_GCC USE_PCH SHAREDLIBEXT CXXCPP EGREP FLEX AR BISON HAS_REGEX HAS_PLUGINS HAS_RESOLVER HAS_SASL HAS_SASL2 HAS_OPENLDAP HAS_OPENSSL P_STATIC_ENDLDLIBS P_STATIC_LDFLAGS HAS_EXPAT HAS_VXML HAS_JABBER HAS_XMLRPC HAS_SOAP HAS_TTS HAS_IPV6 HAS_SDL HAS_VIDEO HAS_VIDEO_CAPTURE USE_SHM_VIDEO_DEVICES HAS_ASN HAS_STUN HAS_PIPECHAN HAS_DTMF HAS_WAVFILE HAS_SOCKS HAS_FTP HAS_SNMP HAS_TELNET HAS_REMCONN HAS_SERIAL HAS_POP3SMTP HAS_HTTP HAS_HTTPSVC HAS_CONFIG_FILE HAS_SOCKAGG HAS_VIDFILE HAS_APPSHARE HAS_AUDIO HAS_OSS HAS_ALSA HAS_ODBC STDCCFLAGS STDCXXFLAGS OPTSTDCCFLAGS ENDLDLIBS DEBUG_FLAG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -889,6 +889,7 @@
--disable-configfile disable config file support
--enable-sockagg enable socket aggregation (experimental)
--enable-vidfile enable video file support
+ --enable-appshare enable Application share support
--disable-audio disable audio support
--enable-alsa enable ALSA audio support
--enable-oss enable OSS audio support
@@ -7874,13 +7875,13 @@
fi
HAS_IPV6=
-HAS_INET_NTOP=
if test "$enable_ipv6" = "no" ; then
{ echo "$as_me:$LINENO: IPV6 disabled" >&5
echo "$as_me: IPV6 disabled" >&6;}
- echo "$as_me:$LINENO: checking for inet_ntop" >&5
-echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6
+else
+ echo "$as_me:$LINENO: checking for IPv6 support" >&5
+echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -7889,11 +7890,10 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <netinet/in.h>
- #include <arpa/inet.h>
int
main ()
{
-int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);
+struct sockaddr_in6 s; s.sin6_scope_id = 0;
;
return 0;
}
@@ -7920,40 +7920,30 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- HAS_INET_NTOP=yes
+ HAS_IPV6=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-HAS_INET_NTOP=no
+HAS_IPV6=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $HAS_INET_NTOP = no ; then
+ if test $HAS_IPV6 = no ; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
else
- cat >>confdefs.h <<\_ACEOF
-#define P_HAS_INET_NTOP 1
-_ACEOF
-
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- fi
-else
- echo "$as_me:$LINENO: checking for IPv6 support" >&5
-echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h>
- #include <netinet/in.h>
+#include <sys/socket.h>
+ #include <netdb.h>
int
main ()
{
-struct sockaddr_in6 s; s.sin6_scope_id = 0;
+getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
;
return 0;
}
@@ -7988,22 +7978,39 @@
HAS_IPV6=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $HAS_IPV6 = no ; then
- echo "$as_me:$LINENO: result: no" >&5
+ if test $HAS_IPV6 = no ; then
+ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
+ else
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define P_HAS_IPV6 1
+_ACEOF
+
+ HAS_IPV6=1
+ fi
+ fi
+fi
+
+
+HAS_INET_NTOP=
+echo "$as_me:$LINENO: checking for inet_ntop" >&5
+echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/socket.h>
- #include <netdb.h>
+#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
int
main ()
{
-getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);
+int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);
;
return 0;
}
@@ -8030,33 +8037,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- HAS_IPV6=yes
+ HAS_INET_NTOP=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-HAS_IPV6=no
+HAS_INET_NTOP=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $HAS_IPV6 = no ; then
- echo "$as_me:$LINENO: result: no" >&5
+if test $HAS_INET_NTOP = no ; then
+ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
- else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define P_HAS_IPV6 1
+else
+ cat >>confdefs.h <<\_ACEOF
+#define P_HAS_INET_NTOP 1
_ACEOF
- HAS_IPV6=1
- fi
- fi
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
fi
-
# Check whether --enable-qos or --disable-qos was given.
if test "${enable_qos+set}" = set; then
enableval="$enable_qos"
@@ -9164,6 +9166,37 @@
+if test "$HAS_VIDEO" \!= "1" ; then
+ default_appshare=no
+fi
+
+# Check whether --enable-vidfile or --disable-vidfile was given.
+if test "${enable_vidfile+set}" = set; then
+ enableval="$enable_vidfile"
+
+fi;
+
+if test "${enable_appshare}z" = "z" ; then
+ enable_vidfile=$default_appshare
+fi
+
+HAS_APPSHARE=
+if test "$enable_appshare" = "no" ; then
+ { echo "$as_me:$LINENO: Application share support disabled" >&5
+echo "$as_me: Application share support disabled" >&6;}
+else
+ { echo "$as_me:$LINENO: Application share enabled" >&5
+echo "$as_me: Application share enabled" >&6;}
+ HAS_APPSHARE=1
+ cat >>confdefs.h <<\_ACEOF
+#define P_APPSHARE 1
+_ACEOF
+
+fi
+
+
+
+
# Check whether --enable-audio or --disable-audio was given.
if test "${enable_audio+set}" = set; then
enableval="$enable_audio"
@@ -10770,6 +10803,7 @@
s,@HAS_CONFIG_FILE@,$HAS_CONFIG_FILE,;t t
s,@HAS_SOCKAGG@,$HAS_SOCKAGG,;t t
s,@HAS_VIDFILE@,$HAS_VIDFILE,;t t
+s,@HAS_APPSHARE@,$HAS_APPSHARE,;t t
s,@HAS_AUDIO@,$HAS_AUDIO,;t t
s,@HAS_OSS@,$HAS_OSS,;t t
s,@HAS_ALSA@,$HAS_ALSA,;t t
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2007-11-05 12:22:36 UTC (rev 18814)
+++ ptlib/trunk/configure.ac 2007-11-05 12:23:10 UTC (rev 18815)
@@ -1582,21 +1582,9 @@
fi
HAS_IPV6=
-HAS_INET_NTOP=
if test "$enable_ipv6" = "no" ; then
AC_MSG_NOTICE(IPV6 disabled)
- AC_MSG_CHECKING(for inet_ntop)
- AC_TRY_COMPILE([#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>],
- [int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);], HAS_INET_NTOP=yes, HAS_INET_NTOP=no)
- if test $HAS_INET_NTOP = no ; then
- AC_MSG_RESULT(no)
- else
- AC_DEFINE(P_HAS_INET_NTOP, 1)
- AC_MSG_RESULT(yes)
- fi
else
AC_MSG_CHECKING(for IPv6 support)
AC_TRY_COMPILE([#include <sys/types.h>
@@ -1619,6 +1607,19 @@
fi
AC_SUBST(HAS_IPV6)
+HAS_INET_NTOP=
+AC_MSG_CHECKING(for inet_ntop)
+AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>],
+ [int af; void * src; char * dst; socklen_t len; inet_ntop(af, src, dst, len);], HAS_INET_NTOP=yes, HAS_INET_NTOP=no)
+if test $HAS_INET_NTOP = no ; then
+ AC_MSG_RESULT(no)
+else
+ AC_DEFINE(P_HAS_INET_NTOP, 1)
+ AC_MSG_RESULT(yes)
+fi
+
dnl ########################################################################
dnl look for QoS functions
Modified: ptlib/trunk/src/ptlib/common/sockets.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/sockets.cxx 2007-11-05 12:22:36 UTC (rev 18814)
+++ ptlib/trunk/src/ptlib/common/sockets.cxx 2007-11-05 12:23:10 UTC (rev 18815)
@@ -2528,8 +2528,8 @@
#endif // P_HAS_IPV6
# if defined(P_HAS_INET_NTOP)
PString str;
- if (inet_ntop(AF_INET, v.four, str.GetPointer(INET_ADDRSTRLEN), INET_ADDRSTRLEN) == NULL)
- return PString::Empty()
+ if (inet_ntop(AF_INET, (const void *)&v.four, str.GetPointer(INET_ADDRSTRLEN), INET_ADDRSTRLEN) == NULL)
+ return PString::Empty();
str.MakeMinimumSize();
return str;
# else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-11-07 05:51:35
|
Revision: 18821
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18821&view=rev
Author: rjongbloed
Date: 2007-11-06 21:51:39 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
Added virtual functions on PProcess called whenever threads are started/ended.
Modified Paths:
--------------
ptlib/trunk/include/ptlib/pprocess.h
ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx
ptlib/trunk/src/ptlib/common/osutils.cxx
ptlib/trunk/src/ptlib/msos/win32.cxx
ptlib/trunk/src/ptlib/unix/tlibbe.cxx
ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
ptlib/trunk/src/ptlib/unix/tlibvx.cxx
Modified: ptlib/trunk/include/ptlib/pprocess.h
===================================================================
--- ptlib/trunk/include/ptlib/pprocess.h 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/include/ptlib/pprocess.h 2007-11-07 05:51:39 UTC (rev 18821)
@@ -455,6 +455,20 @@
*/
static PProcess & Current();
+ /**Callback for when a thread is started by the PTLib system. Note this is
+ called in the context of the new thread.
+ */
+ virtual void OnThreadStart(
+ PThread & thread
+ );
+
+ /**Callback for when a thread is ended if wqas started in the PTLib system.
+ Note this is called in the context of the old thread.
+ */
+ virtual void OnThreadEnded(
+ PThread & thread
+ );
+
/**Determine if the current processes object instance has been initialised.
If this returns TRUE it is safe to use the PProcess::Current() function.
@@ -548,6 +562,10 @@
*/
DWORD GetProcessID() const;
+ /**Return the time at which the program was started
+ */
+ PTime GetStartTime() const;
+
/**Get the effective user name of the owner of the process, eg "root" etc.
This is a platform dependent string only provided by platforms that are
multi-user. Note that some value may be returned as a "simulated" user.
@@ -712,35 +730,31 @@
static PDirectory GetOSConfigDir();
//@}
- PTimerList * GetTimerList();
- /* Get the list of timers handled by the application. This is an internal
+ /**Get the list of timers handled by the application. This is an internal
function and should not need to be called by the user.
@return
list of timers.
*/
+ PTimerList * GetTimerList();
+ /**Internal initialisation function called directly from
+ #_main()#. The user should never call this function.
+ */
static void PreInitialise(
int argc, // Number of program arguments.
char ** argv, // Array of strings for program arguments.
char ** envp // Array of string for the system environment
);
- /* Internal initialisation function called directly from
+
+ /**Internal shutdown function called directly from the ~PProcess
#_main()#. The user should never call this function.
*/
-
static void PreShutdown();
- /* Internal shutdown function called directly from the ~PProcess
- #_main()#. The user should never call this function.
- */
+ /// Main function for process, called from real main after initialisation
virtual int _main(void * arg = NULL);
- // Main function for process, called from real main after initialisation
- PTime GetStartTime() const;
- /* return the time at which the program was started
- */
-
private:
void Construct();
Modified: ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx
===================================================================
--- ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx 2007-11-07 05:51:39 UTC (rev 18821)
@@ -291,6 +291,9 @@
}
void pwNUTask::Entry()
- {
+{
+ PProcess & process = PProcess::Current();
+ process.OnThreadStart(*AssociatedPThread);
AssociatedPThread->Main();
- }
+ process.OnThreadEnded(*AssociatedPThread);
+}
Modified: ptlib/trunk/src/ptlib/common/osutils.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/osutils.cxx 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/common/osutils.cxx 2007-11-07 05:51:39 UTC (rev 18821)
@@ -2239,6 +2239,16 @@
}
+void PProcess::OnThreadStart(PThread & /*thread*/)
+{
+}
+
+
+void PProcess::OnThreadEnded(PThread & /*thread*/)
+{
+}
+
+
BOOL PProcess::IsInitialised()
{
return PProcessInstance != NULL;
Modified: ptlib/trunk/src/ptlib/msos/win32.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/win32.cxx 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/msos/win32.cxx 2007-11-07 05:51:39 UTC (rev 18821)
@@ -1262,7 +1262,9 @@
::CoInitializeEx(NULL, COINIT_MULTITHREADED);
#endif
+ process.OnThreadStart(*thread);
thread->Main();
+ process.OnThreadEnded(*thread);
#if defined(_WIN32_DCOM)
::CoUninitialize();
Modified: ptlib/trunk/src/ptlib/unix/tlibbe.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibbe.cxx 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibbe.cxx 2007-11-07 05:51:39 UTC (rev 18821)
@@ -152,8 +152,12 @@
process.activeThreads.SetAt((unsigned) thread->mId, thread);
process.threadMutex.Signal();
+ process.OnThreadStart(*thread);
+
thread->Main();
+ process.OnThreadEnded(*thread);
+
return 0;
}
Modified: ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx 2007-11-07 05:51:39 UTC (rev 18821)
@@ -429,10 +429,14 @@
thread->suspend_semaphore->Wait(); // Wait for the Resume
}
+ process.OnThreadStart(*thread);
+
// now call the the thread main routine
//PTRACE(1, "tlibthrd\tAbout to call Main");
thread->Main();
+ process.OnThreadEnded(*thread);
+
#ifdef DEBUG_THREADS
if (debug_mpthreads)
fprintf(stderr,"thread %p returning\n", thread);
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2007-11-07 05:51:39 UTC (rev 18821)
@@ -1357,6 +1357,8 @@
PTRACE(5, "PWLib\tStarted thread " << thread << ' ' << thread->threadName);
+ PProcess::Current().OnThreadStart(*thread);
+
// now call the the thread main routine
thread->Main();
@@ -1369,10 +1371,11 @@
void PThread::PX_ThreadEnd(void * arg)
{
+ PThread * thread = (PThread *)arg;
PProcess & process = PProcess::Current();
+ process.OnThreadEnded(*thread);
process.threadMutex.Wait();
- PThread * thread = (PThread *)arg;
pthread_t id = thread->GetThreadId();
if (id == 0) {
// Don't know why, but pthreads under Linux at least can call this function
Modified: ptlib/trunk/src/ptlib/unix/tlibvx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibvx.cxx 2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibvx.cxx 2007-11-07 05:51:39 UTC (rev 18821)
@@ -138,7 +138,9 @@
if (::semTake(thread->syncPoint, WAIT_FOREVER) == OK) {
if (::semDelete(thread->syncPoint) == OK)
thread->syncPoint = NULL;
- thread->Main();
+ process.OnThreadStart(*thread);
+ thread->Main();
+ process.OnThreadEnded(*thread);
}
else
printf("::ThreadFunction> ::semTake failed, errno=0x%X\n",errno);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-11-10 02:07:01
|
Revision: 18828
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18828&view=rev
Author: rjongbloed
Date: 2007-11-09 18:07:02 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Fixed UNICODE support issue where wchar_t is not precisely the same thing as the WORD (aka unsigned short) type previously used in strings.
Modified Paths:
--------------
ptlib/trunk/include/ptclib/asner.h
ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf
ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf
ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf
ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf
ptlib/trunk/include/ptlib/msos/ptlibd_2005_wm.dtf
ptlib/trunk/include/ptlib/msos/ptlibd_2005_wm6.dtf
ptlib/trunk/include/ptlib/msos/ptlibn_2005.dtf
ptlib/trunk/include/ptlib/msos/ptlibn_2005_wm.dtf
ptlib/trunk/include/ptlib/msos/ptlibn_2005_wm6.dtf
ptlib/trunk/include/ptlib/pstring.h
ptlib/trunk/samples/hello_world/helloDLL_2005.vcproj
ptlib/trunk/samples/hello_world/hello_2005.vcproj
ptlib/trunk/src/ptclib/asnber.cxx
ptlib/trunk/src/ptclib/asner.cxx
ptlib/trunk/src/ptlib/common/contain.cxx
ptlib/trunk/src/ptlib/msos/Console_2005.vcproj
ptlib/trunk/src/ptlib/msos/PTLib_2005.vcproj
ptlib/trunk/src/ptlib/msos/win32.cxx
ptlib/trunk/tools/asnparser/main.cxx
Modified: ptlib/trunk/include/ptclib/asner.h
===================================================================
--- ptlib/trunk/include/ptclib/asner.h 2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptclib/asner.h 2007-11-10 02:07:02 UTC (rev 18828)
@@ -740,7 +740,7 @@
PCLASSINFO(PASN_BMPString, PASN_ConstrainedObject);
public:
PASN_BMPString(const char * str = NULL);
- PASN_BMPString(const PWORDArray & wstr);
+ PASN_BMPString(const PWCharArray & wstr);
PASN_BMPString(unsigned tag, TagClass tagClass);
PASN_BMPString(const PASN_BMPString & other);
@@ -748,18 +748,18 @@
PASN_BMPString & operator=(const char * v) { return operator=(PString(v).AsUCS2()); }
PASN_BMPString & operator=(const PString & v) { return operator=(v.AsUCS2()); }
- PASN_BMPString & operator=(const PWORDArray & v);
+ PASN_BMPString & operator=(const PWCharArray & v);
operator PString() const { return GetValue(); }
- operator PWORDArray() const { return value; }
+ operator PWCharArray() const { return value; }
PString GetValue() const { return value; }
- void GetValue(PWORDArray & v) const { v = value; }
+ void GetValue(PWCharArray & v) const { v = value; }
void SetValue(const char * v) { operator=(PString(v).AsUCS2()); }
void SetValue(const PString & v) { operator=(v.AsUCS2()); }
- void SetValue(const PWORDArray & v) { operator=(v); }
+ void SetValue(const PWCharArray & v) { operator=(v); }
void SetValue(const PASN_BMPString & v) { operator=(v.value); }
void SetCharacterSet(ConstraintType ctype, const char * charSet);
- void SetCharacterSet(ConstraintType ctype, const PWORDArray & charSet);
+ void SetCharacterSet(ConstraintType ctype, const PWCharArray & charSet);
void SetCharacterSet(ConstraintType ctype, unsigned firstChar, unsigned lastChar);
virtual Comparison Compare(const PObject & obj) const;
@@ -785,9 +785,9 @@
void Construct();
BOOL IsLegalCharacter(WORD ch);
- PWORDArray value;
- PWORDArray characterSet;
- WORD firstChar, lastChar;
+ PWCharArray value;
+ PWCharArray characterSet;
+ wchar_t firstChar, lastChar;
unsigned charSetUnalignedBits;
unsigned charSetAlignedBits;
};
Modified: ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf 2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlib_2005.dtf 2007-11-10 02:07:02 UTC (rev 18828)
@@ -632,7 +632,6 @@
??0?$PBaseArray@E@@QAE@PBEHH@Z @487 NONAME
??0?$PBaseArray@F@@QAE@H@Z @488 NONAME
??0?$PBaseArray@F@@QAE@PBFHH@Z @489 NONAME
- ??0?$PBaseArray@G@@QAE@ABV0@@Z @490 NONAME
??0?$PBaseArray@G@@QAE@H@Z @491 NONAME
??0?$PBaseArray@G@@QAE@PBGHH@Z @492 NONAME
??0?$PBaseArray@H@@QAE@ABV0@@Z @493 NONAME
@@ -654,6 +653,9 @@
??0?$PBaseArray@PAUPHashTableElement@@@@QAE@PBQAUPHashTableElement@@HH@Z @17946 NONAME
??0?$PBaseArray@PAVPObject@@@@QAE@H@Z @510 NONAME
??0?$PBaseArray@PAVPObject@@@@QAE@PBQAVPObject@@HH@Z @511 NONAME
+ ??0?$PBaseArray@_W@@QAE@ABV0@@Z @18799 NONAME
+ ??0?$PBaseArray@_W@@QAE@H@Z @18800 NONAME
+ ??0?$PBaseArray@_W@@QAE@PB_WHH@Z @18801 NONAME
??0?$PDevicePluginAdapter@VPSoundChannel@@@@QAE@XZ @512 NONAME
??0?$PDevicePluginAdapter@VPVideoInputDevice@@@@QAE@XZ @513 NONAME
??0?$PDevicePluginAdapter@VPVideoOutputDevice@@@@QAE@XZ @514 NONAME
@@ -747,6 +749,8 @@
??0?$PList@VPTimer@@@@QAE@XZ @597 NONAME
??0?$PList@VPXMLRPCVariableBase@@@@IAE@HPBV0@@Z @598 NONAME
??0?$PList@VPXMLRPCVariableBase@@@@QAE@XZ @599 NONAME
+ ??0?$PList@VRouteEntry@PIPSocket@@@@IAE@HPBV0@@Z @18802 NONAME
+ ??0?$PList@VRouteEntry@PIPSocket@@@@QAE@XZ @18803 NONAME
??0?$PList@VRTPerson@PILSSession@@@@IAE@HPBV0@@Z @600 NONAME
??0?$PList@VRTPerson@PILSSession@@@@QAE@ABV0@@Z @601 NONAME
??0?$PList@VRTPerson@PILSSession@@@@QAE@XZ @602 NONAME
@@ -761,9 +765,7 @@
??0?$PQueue@VPXML@@@@QAE@XZ @610 NONAME
??0?$PSafePtr@VPMonitoredSockets@@@@QAE@ABV0@@Z @17492 NONAME
??0?$PScalarArray@F@@QAE@H@Z @611 NONAME
- ??0?$PScalarArray@G@@QAE@ABV0@@Z @612 NONAME
??0?$PScalarArray@G@@QAE@H@Z @613 NONAME
- ??0?$PScalarArray@G@@QAE@PBGHH@Z @614 NONAME
??0?$PScalarArray@H@@QAE@ABV0@@Z @615 NONAME
??0?$PScalarArray@H@@QAE@H@Z @616 NONAME
??0?$PScalarArray@I@@QAE@ABV0@@Z @617 NONAME
@@ -1381,7 +1383,7 @@
??0PASN_BitString@@QAE@IPBE@Z @1132 NONAME
??0PASN_BitString@@QAE@IW4TagClass@PASN_Object@@I@Z @1133 NONAME
??0PASN_BMPString@@QAE@ABV0@@Z @1134 NONAME
- ??0PASN_BMPString@@QAE@ABV?$PScalarArray@G@@@Z @1135 NONAME
+ ??0PASN_BMPString@@QAE@ABV?$PBaseArray@_W@@@Z @18804 NONAME
??0PASN_BMPString@@QAE@IW4TagClass@PASN_Object@@@Z @1136 NONAME
??0PASN_BMPString@@QAE@PBD@Z @1137 NONAME
??0PASN_Boolean@@QAE@ABV0@@Z @1138 NONAME
@@ -1952,7 +1954,7 @@
??0PString@@QAA@W4ConversionType@0@PBDZZ @1628 NONAME
??0PString@@QAE@ABV0@@Z @1629 NONAME
??0PString@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @1630 NONAME
- ??0PString@@QAE@ABV?$PScalarArray@G@@@Z @1631 NONAME
+ ??0PString@@QAE@ABV?$PBaseArray@_W@@@Z @18805 NONAME
??0PString@@QAE@D@Z @1632 NONAME
??0PString@@QAE@F@Z @1633 NONAME
??0PString@@QAE@G@Z @1634 NONAME
@@ -1962,8 +1964,8 @@
??0PString@@QAE@K@Z @1638 NONAME
??0PString@@QAE@PBD@Z @1639 NONAME
??0PString@@QAE@PBDH@Z @1640 NONAME
- ??0PString@@QAE@PBG@Z @1641 NONAME
- ??0PString@@QAE@PBGH@Z @1642 NONAME
+ ??0PString@@QAE@PB_W@Z @18806 NONAME
+ ??0PString@@QAE@PB_WH@Z @18807 NONAME
??0PString@@QAE@W4ConversionType@0@JI@Z @1643 NONAME
??0PString@@QAE@W4ConversionType@0@NI@Z @1644 NONAME
??0PString@@QAE@XZ @1645 NONAME
@@ -2442,6 +2444,7 @@
??1?$PBaseArray@PAUberval@@@@UAE@XZ @2090 NONAME
??1?$PBaseArray@PAUPHashTableElement@@@@UAE@XZ @18069 NONAME
??1?$PBaseArray@PAVPObject@@@@UAE@XZ @2092 NONAME
+ ??1?$PBaseArray@_W@@UAE@XZ @18808 NONAME
??1?$PDevicePluginAdapter@VPSoundChannel@@@@UAE@XZ @2093 NONAME
??1?$PDevicePluginAdapter@VPVideoInputDevice@@@@UAE@XZ @2094 NONAME
??1?$PDevicePluginAdapter@VPVideoOutputDevice@@@@UAE@XZ @2095 NONAME
@@ -2495,6 +2498,7 @@
??1?$PList@VPThread@@@@UAE@XZ @2139 NONAME
??1?$PList@VPTimer@@@@UAE@XZ @2140 NONAME
??1?$PList@VPXMLRPCVariableBase@@@@UAE@XZ @2141 NONAME
+ ??1?$PList@VRouteEntry@PIPSocket@@@@UAE@XZ @18809 NONAME
??1?$PList@VRTPerson@PILSSession@@@@UAE@XZ @2142 NONAME
??1?$PList@VStanza@XMPP@@@@UAE@XZ @2143 NONAME
??1?$PNatMethodServiceDescriptor@VPSTUNClient@@@@UAE@XZ @16855 NONAME
@@ -3320,6 +3324,7 @@
??4?$PBaseArray@I@@QAEAAV0@ABV0@@Z @2891 NONAME
??4?$PBaseArray@J@@QAEAAV0@ABV0@@Z @2892 NONAME
??4?$PBaseArray@K@@QAEAAV0@ABV0@@Z @2893 NONAME
+ ??4?$PBaseArray@_W@@QAEAAV0@ABV0@@Z @18810 NONAME
??4?$PList@VIdentity@Disco@XMPP@@@@QAEAAV0@ABV0@@Z @2894 NONAME
??4?$PList@VInterfaceEntry@PIPSocket@@@@QAEAAV0@ABV0@@Z @17535 NONAME
??4?$PList@VPString@@@@QAEAAV0@ABV0@@Z @2895 NONAME
@@ -3360,7 +3365,7 @@
??4PASN_Array@@QAEAAV0@ABV0@@Z @2929 NONAME
??4PASN_BitString@@QAEAAV0@ABV0@@Z @2930 NONAME
??4PASN_BMPString@@QAEAAV0@ABV0@@Z @2931 NONAME
- ??4PASN_BMPString@@QAEAAV0@ABV?$PScalarArray@G@@@Z @2932 NONAME
+ ??4PASN_BMPString@@QAEAAV0@ABV?$PBaseArray@_W@@@Z @18811 NONAME
??4PASN_Boolean@@QAEAAV0@H@Z @2933 NONAME
??4PASN_Choice@@QAEAAV0@ABV0@@Z @2934 NONAME
??4PASN_ConstrainedObject@@QAEAAV0@ABV0@@Z @2935 NONAME
@@ -3620,7 +3625,6 @@
??A?$PBaseArray@E@@QBEEH@Z @3151 NONAME
??A?$PBaseArray@F@@QAEAAFH@Z @3152 NONAME
??A?$PBaseArray@G@@QAEAAGH@Z @3153 NONAME
- ??A?$PBaseArray@G@@QBEGH@Z @3154 NONAME
??A?$PBaseArray@H@@QAEAAHH@Z @3155 NONAME
??A?$PBaseArray@H@@QBEHH@Z @3156 NONAME
??A?$PBaseArray@I@@QAEAAIH@Z @3157 NONAME
@@ -3633,6 +3637,8 @@
??A?$PBaseArray@PAUPHashTableElement@@@@QAEAAPAUPHashTableElement@@H@Z @18134 NONAME
??A?$PBaseArray@PAUPHashTableElement@@@@QBEPAUPHashTableElement@@H@Z @18135 NONAME
??A?$PBaseArray@PAVPObject@@@@QAEAAPAVPObject@@H@Z @3166 NONAME
+ ??A?$PBaseArray@_W@@QAEAA_WH@Z @18812 NONAME
+ ??A?$PBaseArray@_W@@QBE_WH@Z @18813 NONAME
??A?$PDictionary@VJID@XMPP@@VPNotifierList@@@@QBEAAVPNotifierList@@ABVJID@XMPP@@@Z @3167 NONAME
??A?$PDictionary@VPString@@VPNotifierList@@@@QBEAAVPNotifierList@@ABVPString@@@Z @3168 NONAME
??A?$PList@VIdentity@Disco@XMPP@@@@QBEAAVIdentity@Disco@XMPP@@H@Z @3169 NONAME
@@ -3698,6 +3704,7 @@
??B?$PBaseArray@PAUberval@@@@QBEPBQAUberval@@XZ @3228 NONAME
??B?$PBaseArray@PAUPHashTableElement@@@@QBEPBQAUPHashTableElement@@XZ @18137 NONAME
??B?$PBaseArray@PAVPObject@@@@QBEPBQAVPObject@@XZ @3230 NONAME
+ ??B?$PBaseArray@_W@@QBEPB_WXZ @18814 NONAME
??B?$PSafePtr@VPMonitoredSockets@@@@QBEPAVPMonitoredSockets@@XZ @17542 NONAME
??BAddress@PEthSocket@@QBE?AVPString@@XZ @3231 NONAME
??BAddress@PIPSocket@@QBE?AUin6_addr@@XZ @3232 NONAME
@@ -4172,6 +4179,7 @@
??_7?$PBaseArray@PAUberval@@@@6B@ @3602 NONAME
??_7?$PBaseArray@PAUPHashTableElement@@@@6B@ @18199 NONAME
??_7?$PBaseArray@PAVPObject@@@@6B@ @3604 NONAME
+ ??_7?$PBaseArray@_W@@6B@ @18815 NONAME
??_7?$PDevicePluginAdapter@VPSoundChannel@@@@6B@ @3605 NONAME
??_7?$PDevicePluginAdapter@VPVideoInputDevice@@@@6B@ @3606 NONAME
??_7?$PDevicePluginAdapter@VPVideoOutputDevice@@@@6B@ @3607 NONAME
@@ -4225,6 +4233,7 @@
??_7?$PList@VPThread@@@@6B@ @3651 NONAME
??_7?$PList@VPTimer@@@@6B@ @3652 NONAME
??_7?$PList@VPXMLRPCVariableBase@@@@6B@ @3653 NONAME
+ ??_7?$PList@VRouteEntry@PIPSocket@@@@6B@ @18816 NONAME
??_7?$PList@VRTPerson@PILSSession@@@@6B@ @3654 NONAME
??_7?$PList@VStanza@XMPP@@@@6B@ @3655 NONAME
??_7?$PNatMethodServiceDescriptor@VPSTUNClient@@@@6B@ @16898 NONAME
@@ -5296,6 +5305,7 @@
??_R0?AV?$PBaseArray@PAUberval@@@@@8 @4657 NONAME
??_R0?AV?$PBaseArray@PAUPHashTableElement@@@@@8 @18234 NONAME
??_R0?AV?$PBaseArray@PAVPObject@@@@@8 @4659 NONAME
+ ??_R0?AV?$PBaseArray@_W@@@8 @18817 NONAME
??_R0?AV?$PDevicePluginAdapter@VPSoundChannel@@@@@8 @4660 NONAME
??_R0?AV?$PDevicePluginAdapter@VPVideoInputDevice@@@@@8 @4661 NONAME
??_R0?AV?$PDevicePluginAdapter@VPVideoOutputDevice@@@@@8 @4662 NONAME
@@ -5349,6 +5359,7 @@
??_R0?AV?$PList@VPThread@@@@@8 @4706 NONAME
??_R0?AV?$PList@VPTimer@@@@@8 @4707 NONAME
??_R0?AV?$PList@VPXMLRPCVariableBase@@@@@8 @4708 NONAME
+ ??_R0?AV?$PList@VRouteEntry@PIPSocket@@@@@8 @18818 NONAME
??_R0?AV?$PList@VRTPerson@PILSSession@@@@@8 @4709 NONAME
??_R0?AV?$PList@VStanza@XMPP@@@@@8 @4710 NONAME
??_R0?AV?$PNatMethodServiceDescriptor@VPSTUNClient@@@@@8 @16907 NONAME
@@ -6091,6 +6102,7 @@
??_R1A@?0A@EA@?$PBaseArray@PAUberval@@@@8 @5396 NONAME
??_R1A@?0A@EA@?$PBaseArray@PAUPHashTableElement@@@@8 @18263 NONAME
??_R1A@?0A@EA@?$PBaseArray@PAVPObject@@@@8 @5398 NONAME
+ ??_R1A@?0A@EA@?$PBaseArray@_W@@8 @18819 NONAME
??_R1A@?0A@EA@?$PDevicePluginAdapter@VPSoundChannel@@@@8 @5399 NONAME
??_R1A@?0A@EA@?$PDevicePluginAdapter@VPVideoInputDevice@@@@8 @5400 NONAME
??_R1A@?0A@EA@?$PDevicePluginAdapter@VPVideoOutputDevice@@@@8 @5401 NONAME
@@ -6144,6 +6156,7 @@
??_R1A@?0A@EA@?$PList@VPThread@@@@8 @5445 NONAME
??_R1A@?0A@EA@?$PList@VPTimer@@@@8 @5446 NONAME
??_R1A@?0A@EA@?$PList@VPXMLRPCVariableBase@@@@8 @5447 NONAME
+ ??_R1A@?0A@EA@?$PList@VRouteEntry@PIPSocket@@@@8 @18820 NONAME
??_R1A@?0A@EA@?$PList@VRTPerson@PILSSession@@@@8 @5448 NONAME
??_R1A@?0A@EA@?$PList@VStanza@XMPP@@@@8 @5449 NONAME
??_R1A@?0A@EA@?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16915 NONAME
@@ -6941,6 +6954,7 @@
??_R2?$PBaseArray@PAUberval@@@@8 @6186 NONAME
??_R2?$PBaseArray@PAUPHashTableElement@@@@8 @18295 NONAME
??_R2?$PBaseArray@PAVPObject@@@@8 @6188 NONAME
+ ??_R2?$PBaseArray@_W@@8 @18821 NONAME
??_R2?$PDevicePluginAdapter@VPSoundChannel@@@@8 @6189 NONAME
??_R2?$PDevicePluginAdapter@VPVideoInputDevice@@@@8 @6190 NONAME
??_R2?$PDevicePluginAdapter@VPVideoOutputDevice@@@@8 @6191 NONAME
@@ -6994,6 +7008,7 @@
??_R2?$PList@VPThread@@@@8 @6235 NONAME
??_R2?$PList@VPTimer@@@@8 @6236 NONAME
??_R2?$PList@VPXMLRPCVariableBase@@@@8 @6237 NONAME
+ ??_R2?$PList@VRouteEntry@PIPSocket@@@@8 @18822 NONAME
??_R2?$PList@VRTPerson@PILSSession@@@@8 @6238 NONAME
??_R2?$PList@VStanza@XMPP@@@@8 @6239 NONAME
??_R2?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16924 NONAME
@@ -7754,6 +7769,7 @@
??_R3?$PBaseArray@PAUberval@@@@8 @6943 NONAME
??_R3?$PBaseArray@PAUPHashTableElement@@@@8 @18324 NONAME
??_R3?$PBaseArray@PAVPObject@@@@8 @6945 NONAME
+ ??_R3?$PBaseArray@_W@@8 @18823 NONAME
??_R3?$PDevicePluginAdapter@VPSoundChannel@@@@8 @6946 NONAME
??_R3?$PDevicePluginAdapter@VPVideoInputDevice@@@@8 @6947 NONAME
??_R3?$PDevicePluginAdapter@VPVideoOutputDevice@@@@8 @6948 NONAME
@@ -7807,6 +7823,7 @@
??_R3?$PList@VPThread@@@@8 @6992 NONAME
??_R3?$PList@VPTimer@@@@8 @6993 NONAME
??_R3?$PList@VPXMLRPCVariableBase@@@@8 @6994 NONAME
+ ??_R3?$PList@VRouteEntry@PIPSocket@@@@8 @18824 NONAME
??_R3?$PList@VRTPerson@PILSSession@@@@8 @6995 NONAME
??_R3?$PList@VStanza@XMPP@@@@8 @6996 NONAME
??_R3?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16932 NONAME
@@ -8562,6 +8579,7 @@
??_R4?$PBaseArray@PAUberval@@@@6B@ @7695 NONAME
??_R4?$PBaseArray@PAUPHashTableElement@@@@6B@ @18353 NONAME
??_R4?$PBaseArray@PAVPObject@@@@6B@ @7697 NONAME
+ ??_R4?$PBaseArray@_W@@6B@ @18825 NONAME
??_R4?$PDevicePluginAdapter@VPSoundChannel@@@@6B@ @7698 NONAME
??_R4?$PDevicePluginAdapter@VPVideoInputDevice@@@@6B@ @7699 NONAME
??_R4?$PDevicePluginAdapter@VPVideoOutputDevice@@@@6B@ @7700 NONAME
@@ -8615,6 +8633,7 @@
??_R4?$PList@VPThread@@@@6B@ @7744 NONAME
??_R4?$PList@VPTimer@@@@6B@ @7745 NONAME
??_R4?$PList@VPXMLRPCVariableBase@@@@6B@ @7746 NONAME
+ ??_R4?$PList@VRouteEntry@PIPSocket@@@@6B@ @18826 NONAME
??_R4?$PList@VRTPerson@PILSSession@@@@6B@ @7747 NONAME
??_R4?$PList@VStanza@XMPP@@@@6B@ @7748 NONAME
??_R4?$PNatMethodServiceDescriptor@VPSTUNClient@@@@6B@ @16940 NONAME
@@ -9657,7 +9676,7 @@
?AsString@PURL@@QBE?AVPString@@W4UrlFormat@1@@Z @8709 NONAME
?AsString@PURLLegacyScheme@@UBE?AVPString@@W4UrlFormat@PURL@@ABV4@@Z @8710 NONAME
?AssureConnect@PHTTPClient@@IAEHABVPURL@@AAVPMIMEInfo@@@Z @8711 NONAME
- ?AsUCS2@PString@@QBE?AV?$PScalarArray@G@@XZ @8712 NONAME
+ ?AsUCS2@PString@@QBE?AV?$PBaseArray@_W@@XZ @18827 NONAME
?AsUnsigned64@PString@@QBE_KI@Z @8713 NONAME
?AsUnsigned@PString@@QBEKI@Z @8714 NONAME
?AsXML@Identity@Disco@XMPP@@QBEPAVPXMLElement@@PAV4@@Z @8715 NONAME
@@ -9871,6 +9890,7 @@
?Class@?$PBaseArray@PAUberval@@@@SAPBDXZ @8907 NONAME
?Class@?$PBaseArray@PAUPHashTableElement@@@@SAPBDXZ @18401 NONAME
?Class@?$PBaseArray@PAVPObject@@@@SAPBDXZ @8909 NONAME
+ ?Class@?$PBaseArray@_W@@SAPBDXZ @18828 NONAME
?Class@?$PDictionary@VJID@XMPP@@VPNotifierList@@@@SAPBDXZ @8910 NONAME
?Class@?$PDictionary@VPCaselessString@@VPIPCacheData@@@@SAPBDXZ @8911 NONAME
?Class@?$PDictionary@VPIPCacheKey@@VPIPCacheData@@@@SAPBDXZ @8912 NONAME
@@ -9904,6 +9924,7 @@
?Class@?$PList@VPThread@@@@SAPBDXZ @8940 NONAME
?Class@?$PList@VPTimer@@@@SAPBDXZ @8941 NONAME
?Class@?$PList@VPXMLRPCVariableBase@@@@SAPBDXZ @8942 NONAME
+ ?Class@?$PList@VRouteEntry@PIPSocket@@@@SAPBDXZ @18829 NONAME
?Class@?$PList@VRTPerson@PILSSession@@@@SAPBDXZ @8943 NONAME
?Class@?$PList@VStanza@XMPP@@@@SAPBDXZ @8944 NONAME
?Class@?$POrdinalDictionary@VPString@@@@SAPBDXZ @8945 NONAME
@@ -10336,6 +10357,7 @@
?Clone@?$PBaseArray@PAUberval@@@@UBEPAVPObject@@XZ @9328 NONAME
?Clone@?$PBaseArray@PAUPHashTableElement@@@@UBEPAVPObject@@XZ @18430 NONAME
?Clone@?$PBaseArray@PAVPObject@@@@UBEPAVPObject@@XZ @9330 NONAME
+ ?Clone@?$PBaseArray@_W@@UBEPAVPObject@@XZ @18830 NONAME
?Clone@?$PDictionary@VJID@XMPP@@VPNotifierList@@@@UBEPAVPObject@@XZ @9331 NONAME
?Clone@?$PDictionary@VPCaselessString@@VPIPCacheData@@@@UBEPAVPObject@@XZ @9332 NONAME
?Clone@?$PDictionary@VPIPCacheKey@@VPIPCacheData@@@@UBEPAVPObject@@XZ @9333 NONAME
@@ -10369,6 +10391,7 @@
?Clone@?$PList@VPThread@@@@UBEPAVPObject@@XZ @9361 NONAME
?Clone@?$PList@VPTimer@@@@UBEPAVPObject@@XZ @9362 NONAME
?Clone@?$PList@VPXMLRPCVariableBase@@@@UBEPAVPObject@@XZ @9363 NONAME
+ ?Clone@?$PList@VRouteEntry@PIPSocket@@@@UBEPAVPObject@@XZ @18831 NONAME
?Clone@?$PList@VRTPerson@PILSSession@@@@UBEPAVPObject@@XZ @9364 NONAME
?Clone@?$PList@VStanza@XMPP@@@@UBEPAVPObject@@XZ @9365 NONAME
?Clone@?$POrdinalDictionary@VPString@@@@UBEPAVPObject@@XZ @9366 NONAME
@@ -10619,6 +10642,7 @@
?CompareObjectMemoryDirect@?$PBaseArray@PAUberval@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9576 NONAME
?CompareObjectMemoryDirect@?$PBaseArray@PAUPHashTableElement@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @18457 NONAME
?CompareObjectMemoryDirect@?$PBaseArray@PAVPObject@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9578 NONAME
+ ?CompareObjectMemoryDirect@?$PBaseArray@_W@@UBE?AW4Comparison@PObject@@ABV3@@Z @18832 NONAME
?CompareObjectMemoryDirect@?$PDictionary@VJID@XMPP@@VPNotifierList@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9579 NONAME
?CompareObjectMemoryDirect@?$PDictionary@VPCaselessString@@VPIPCacheData@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9580 NONAME
?CompareObjectMemoryDirect@?$PDictionary@VPIPCacheKey@@VPIPCacheData@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9581 NONAME
@@ -10652,6 +10676,7 @@
?CompareObjectMemoryDirect@?$PList@VPThread@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9609 NONAME
?CompareObjectMemoryDirect@?$PList@VPTimer@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9610 NONAME
?CompareObjectMemoryDirect@?$PList@VPXMLRPCVariableBase@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9611 NONAME
+ ?CompareObjectMemoryDirect@?$PList@VRouteEntry@PIPSocket@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @18833 NONAME
?CompareObjectMemoryDirect@?$PList@VRTPerson@PILSSession@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9612 NONAME
?CompareObjectMemoryDirect@?$PList@VStanza@XMPP@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9613 NONAME
?CompareObjectMemoryDirect@?$POrdinalDictionary@VPString@@@@UBE?AW4Comparison@PObject@@ABV3@@Z @9614 NONAME
@@ -12089,6 +12114,7 @@
?GetAt@?$PBaseArray@PAUberval@@@@QBEPAUberval@@H@Z @10873 NONAME
?GetAt@?$PBaseArray@PAUPHashTableElement@@@@QBEPAUPHashTableElement@@H@Z @18547 NONAME
?GetAt@?$PBaseArray@PAVPObject@@@@QBEPAVPObject@@H@Z @10875 NONAME
+ ?GetAt@?$PBaseArray@_W@@QBE_WH@Z @18834 NONAME
?GetAt@?$PDictionary@VJID@XMPP@@VPNotifierList@@@@UBEPAVPNotifierList@@ABVJID@XMPP@@@Z @10876 NONAME
?GetAt@?$PDictionary@VPCaselessString@@VPIPCacheData@@@@UBEPAVPIPCacheData@@ABVPCaselessString@@@Z @10877 NONAME
?GetAt@?$PDictionary@VPIPCacheKey@@VPIPCacheData@@@@UBEPAVPIPCacheData@@ABVPIPCacheKey@@@Z @10878 NONAME
@@ -12171,6 +12197,7 @@
?GetClass@?$PBaseArray@PAUberval@@@@UBEPBDI@Z @10946 NONAME
?GetClass@?$PBaseArray@PAUPHashTableElement@@@@UBEPBDI@Z @18552 NONAME
?GetClass@?$PBaseArray@PAVPObject@@@@UBEPBDI@Z @10948 NONAME
+ ?GetClass@?$PBaseArray@_W@@UBEPBDI@Z @18835 NONAME
?GetClass@?$PDictionary@VJID@XMPP@@VPNotifierList@@@@UBEPBDI@Z @10949 NONAME
?GetClass@?$PDictionary@VPCaselessString@@VPIPCacheData@@@@UBEPBDI@Z @10950 NONAME
?GetClass@?$PDictionary@VPIPCacheKey@@VPIPCacheData@@@@UBEPBDI@Z @10951 NONAME
@@ -12204,6 +12231,7 @@
?GetClass@?$PList@VPThread@@@@UBEPBDI@Z @10979 NONAME
?GetClass@?$PList@VPTimer@@@@UBEPBDI@Z @10980 NONAME
?GetClass@?$PList@VPXMLRPCVariableBase@@@@UBEPBDI@Z @10981 NONAME
+ ?GetClass@?$PList@VRouteEntry@PIPSocket@@@@UBEPBDI@Z @18836 NONAME
?GetClass@?$PList@VRTPerson@PILSSession@@@@UBEPBDI@Z @10982 NONAME
?GetClass@?$PList@VStanza@XMPP@@@@UBEPBDI@Z @10983 NONAME
?GetClass@?$POrdinalDictionary@VPString@@@@UBEPBDI@Z @10984 NONAME
@@ -12655,6 +12683,13 @@
?GetDescription@PWAVFileFormatG7231_ms@@UBE?AVPString@@XZ @11390 NONAME
?GetDescription@PWAVFileFormatG7231_vivo@@UBE?AVPString@@XZ @11391 NONAME
?GetDescription@PWAVFileFormatPCM@@UBE?AVPString@@XZ @11392 NONAME
+ ?GetDeviceCapabilities@?$PVideoInputPluginServiceDescriptor@VPVideoInputDevice_FakeVideo@@@@UBE_NABVPString@@PAX@Z @18837 NONAME
+ ?GetDeviceCapabilities@?$PVideoInputPluginServiceDescriptor@VPVideoInputDevice_VideoForWindows@@@@UBE_NABVPString@@PAX@Z @18838 NONAME
+ ?GetDeviceCapabilities@PDevicePluginServiceDescriptor@@UBE_NABVPString@@PAX@Z @18839 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice@@SAHABVPString@@0PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@PAVPPluginManager@@@Z @18840 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@PAVPPluginManager@@@Z @18841 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice_FakeVideo@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@@Z @18842 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice_VideoForWindows@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@@Z @18843 NONAME
?GetDeviceID@PSoundChannelDirectSound@@AAEHVPString@@PAU_GUID@@@Z @17819 NONAME
?GetDeviceID@PSoundChannelWin32@@AAEHABVPString@@W4Directions@PSoundChannel@@AAI@Z @11393 NONAME
?GetDeviceNames@?$PNatMethodServiceDescriptor@VPSTUNClient@@@@UBE?AVPStringList@@H@Z @16994 NONAME
@@ -12899,6 +12934,7 @@
?GetInteger@PWin32AsnAny@@QAEHAAJ@Z @11618 NONAME
?GetInterface@PIPSocket@@SA?AVPString@@VAddress@1@@Z @11619 NONAME
?GetInterface@PMonitoredSocketChannel@@QAEABVPString@@XZ @17685 NONAME
+ ?GetInterface@RouteEntry@PIPSocket@@QBEABVPString@@XZ @18844 NONAME
?GetInterfaceAddress@PWin32SnmpLibrary@@QAE?AVAddress@PIPSocket@@H@Z @11620 NONAME
?GetInterfaceInfo@PInterfaceMonitor@@QAEHABVPString@@AAVInterfaceEntry@PIPSocket@@@Z @17686 NONAME
?GetInterfaceInfo@PInterfaceMonitorClient@@UAEHABVPString@@AAVInterfaceEntry@PIPSocket@@@Z @17687 NONAME
@@ -13047,6 +13083,8 @@
?GetNatTypeString@PSTUNClient@@SA?AVPString@@W4NatTypes@1@@Z @11749 NONAME
?GetNest@PReadWriteMutex@@IBEPAVNest@1@XZ @11750 NONAME
?GetNetMask@InterfaceEntry@PIPSocket@@QBE?AVAddress@2@XZ @11751 NONAME
+ ?GetNetMask@RouteEntry@PIPSocket@@QBE?AVAddress@2@XZ @18845 NONAME
+ ?GetNetwork@RouteEntry@PIPSocket@@QBE?AVAddress@2@XZ @18846 NONAME
?GetNetworkInterface@PIPSocket@@SAHAAVAddress@1@@Z @11752 NONAME
?GetNext@MXRecordList@PDNS@@QAEPAVMXRecord@2@XZ @11753 NONAME
?GetNext@NAPTRRecordList@PDNS@@QAEPAVNAPTRRecord@2@PBD@Z @11754 NONAME
@@ -13160,6 +13198,7 @@
?GetPluginDirs@PPluginManager@@SA?AVPStringArray@@XZ @11861 NONAME
?GetPluginList@PPluginModuleManager@@UBE?AV?$PDictionary@VPString@@VPDynaLink@@@@XZ @11862 NONAME
?GetPluginManager@PPluginManager@@SAAAV1@XZ @11863 NONAME
+ ?GetPluginsDeviceCapabilities@PPluginManager@@QBEHABVPString@@00PAX@Z @18847 NONAME
?GetPluginsDeviceNames@PPluginManager@@QBE?AVPStringList@@ABVPString@@0H@Z @11864 NONAME
?GetPluginsProviding@PPluginManager@@QBE?AVPStringList@@ABVPString@@@Z @11865 NONAME
?GetPluginTypes@PPluginManager@@QBE?AVPStringList@@XZ @11866 NONAME
@@ -13173,6 +13212,7 @@
?GetPointer@?$PBaseArray@K@@QAEPAKH@Z @11874 NONAME
?GetPointer@?$PBaseArray@PAD@@QAEPAPADH@Z @11875 NONAME
?GetPointer@?$PBaseArray@PAUberval@@@@QAEPAPAUberval@@H@Z @11876 NONAME
+ ?GetPointer@?$PBaseArray@_W@@QAEPA_WH@Z @18848 NONAME
?GetPointer@Address@PIPSocket@@QBEPBDXZ @11877 NONAME
?GetPointer@PAbstractArray@@QAEPAXH@Z @11878 NONAME
?GetPointer@PASN_OctetString@@QAEPAEH@Z @11879 NONAME
@@ -13251,6 +13291,7 @@
?GetRoot@PDirectory@@QBE?AV1@XZ @11947 NONAME
?GetRootElement@PXML@@QBEPAVPXMLElement@@XZ @11948 NONAME
?GetRouteAddress@PIPSocket@@SA?AVAddress@1@V21@@Z @11949 NONAME
+ ?GetRouteInterfaceAddress@PIPSocket@@SA?AVAddress@1@V21@@Z @18849 NONAME
?GetRouteTable@PIPSocket@@SAHAAV?$PList@VRouteEntry@PIPSocket@@@@@Z @11950 NONAME
?GetSampleRate@PSound@@QBEIXZ @11951 NONAME
?GetSampleRate@PSoundChannel@@UBEIXZ @11952 NONAME
@@ -13669,7 +13710,7 @@
?InternalCompleteDigest@PMessageDigest5@@MAEXAAVResult@PMessageDigest@@@Z @12330 NONAME
?InternalCompleteDigest@PMessageDigestSHA1@@MAEXAAVResult@PMessageDigest@@@Z @12331 NONAME
?InternalEndRead@PReadWriteMutex@@IAEXXZ @12332 NONAME
- ?InternalFromUCS2@PString@@IAEXPBGH@Z @12333 NONAME
+ ?InternalFromUCS2@PString@@IAEXPB_WH@Z @18850 NONAME
?InternalGetData@PODBCRecord@@QAEHGPAXKPAJH@Z @12334 NONAME
?InternalIsDescendant@?$PArray@VField@PODBC@@@@UBEHPBD@Z @12335 NONAME
?InternalIsDescendant@?$PArray@VPASN_Object@@@@UBEHPBD@Z @12336 NONAME
@@ -13692,6 +13733,7 @@
?InternalIsDescendant@?$PBaseArray@PAUberval@@@@UBEHPBD@Z @12353 NONAME
?InternalIsDescendant@?$PBaseArray@PAUPHashTableElement@@@@UBEHPBD@Z @18604 NONAME
?InternalIsDescendant@?$PBaseArray@PAVPObject@@@@UBEHPBD@Z @12355 NONAME
+ ?InternalIsDescendant@?$PBaseArray@_W@@UBEHPBD@Z @18851 NONAME
?InternalIsDescendant@?$PDictionary@VJID@XMPP@@VPNotifierList@@@@UBEHPBD@Z @12356 NONAME
?InternalIsDescendant@?$PDictionary@VPCaselessString@@VPIPCacheData@@@@UBEHPBD@Z @12357 NONAME
?InternalIsDescendant@?$PDictionary@VPIPCacheKey@@VPIPCacheData@@@@UBEHPBD@Z @12358 NONAME
@@ -13725,6 +13767,7 @@
?InternalIsDescendant@?$PList@VPThread@@@@UBEHPBD@Z @12386 NONAME
?InternalIsDescendant@?$PList@VPTimer@@@@UBEHPBD@Z @12387 NONAME
?InternalIsDescendant@?$PList@VPXMLRPCVariableBase@@@@UBEHPBD@Z @12388 NONAME
+ ?InternalIsDescendant@?$PList@VRouteEntry@PIPSocket@@@@UBEHPBD@Z @18852 NONAME
?InternalIsDescendant@?$PList@VRTPerson@PILSSession@@@@UBEHPBD@Z @12389 NONAME
?InternalIsDescendant@?$PList@VStanza@XMPP@@@@UBEHPBD@Z @12390 NONAME
?InternalIsDescendant@?$POrdinalDictionary@VPString@@@@UBEHPBD@Z @12391 NONAME
@@ -14748,6 +14791,8 @@
?OnSyntaxError@PFTPServer@@UAEXH@Z @13323 NONAME
?OnSYST@PFTPServer@@UAEHABVPCaselessString@@@Z @13324 NONAME
?OnTextData@PSMTPServer@@MAEHAAVPCharArray@@AAH@Z @13325 NONAME
+ ?OnThreadEnded@PProcess@@UAEXAAVPThread@@@Z @18853 NONAME
+ ?OnThreadStart@PProcess@@UAEXAAVPThread@@@Z @18854 NONAME
?OnTimeout@PTimer@@UAEXXZ @13326 NONAME
?OnTOP@PPOP3Server@@MAEXHH@Z @13327 NONAME
?OnTURN@PSMTPServer@@MAEXXZ @13329 NONAME
@@ -15045,6 +15090,7 @@
?PrintElementOn@?$PBaseArray@PAUberval@@@@MBEXAAV?$basic_ostream@DU?$char_traits@D@std@@@std@@H@Z @13604 NONAME
?PrintElementOn@?$PBaseArray@PAUPHashTableElement@@@@MBEXAAV?$basic_ostream@DU?$char_traits@D@std@@@std@@H@Z @18659 NONAME
?PrintElementOn@?$PBaseArray@PAVPObject@@@@MBEXAAV?$basic_ostream@DU?$char_traits@D@std@@@std@@H@Z @13606 NONAME
+ ?PrintElementOn@?$PBaseArray@_W@@MBEXAAV?$basic_ostream@DU?$char_traits@D@std@@@std@@H@Z @18855 NONAME
?PrintElementOn@PAbstractArray@@MBEXAAV?$basic_ostream@DU?$char_traits@D@std@@@std@@H@Z @13607 NONAME
?PrintOn@InterfaceEntry@PIPSocket@@UBEXAAV?$basic_ostream@DU?$char_traits@D@std@@@std@@@Z @13608 NONAME
?PrintOn@JID@XMPP@@UBEXAAV?$basic_ostream@DU?$char_traits@D@std@@@std@@@Z @13609 NONAME
@@ -15686,7 +15732,7 @@
?SetChannel@PVideoInputDevice_FakeVideo@@UAEHH@Z @14205 NONAME
?SetChannel@PVideoInputDevice_YUVFile@@UAEHH@Z @14206 NONAME
?SetChannels@PWAVFile@@UAEXI@Z @14207 NONAME
- ?SetCharacterSet@PASN_BMPString@@QAEXW4ConstraintType@PASN_Object@@ABV?$PScalarArray@G@@@Z @14208 NONAME
+ ?SetCharacterSet@PASN_BMPString@@QAEXW4ConstraintType@PASN_Object@@ABV?$PBaseArray@_W@@@Z @18856 NONAME
?SetCharacterSet@PASN_BMPString@@UAEXW4ConstraintType@PASN_Object@@II@Z @14209 NONAME
?SetCharacterSet@PASN_BMPString@@UAEXW4ConstraintType@PASN_Object@@PBD@Z @14210 NONAME
?SetCharacterSet@PASN_ConstrainedString@@QAEXPBDHW4ConstraintType@PASN_Object@@@Z @14211 NONAME
@@ -15991,7 +16037,7 @@
?SetUserName@PURL@@QAEXABVPString@@@Z @14495 NONAME
?SetValue@BinaryModAttrib@PLDAPSession@@QAEXABVPBYTEArray@@@Z @14496 NONAME
?SetValue@Field@PODBC@@QAEXVPString@@@Z @14497 NONAME
- ?SetValue@PASN_BMPString@@QAEXABV?$PScalarArray@G@@@Z @14498 NONAME
+ ?SetValue@PASN_BMPString@@QAEXABV?$PBaseArray@_W@@@Z @18857 NONAME
?SetValue@PASN_BMPString@@QAEXPBD@Z @14499 NONAME
?SetValue@PASN_ConstrainedString@@QAEXABVPString@@@Z @14500 NONAME
?SetValue@PASN_ConstrainedString@@QAEXPBD@Z @14501 NONAME
Modified: ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf 2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlib_2005_wm.dtf 2007-11-10 02:07:02 UTC (rev 18828)
@@ -620,14 +620,14 @@
??0?$PList@VPThread@@@@QAA@XZ @17720 NONAME
??0?$PList@VPTimer@@@@IAA@HPBV0@@Z @17721 NONAME
??0?$PList@VPTimer@@@@QAA@XZ @17722 NONAME
+ ??0?$PList@VRouteEntry@PIPSocket@@@@IAA@HPBV0@@Z @25647 NONAME
+ ??0?$PList@VRouteEntry@PIPSocket@@@@QAA@XZ @25648 NONAME
??0?$PNatMethodServiceDescriptor@VPSTUNClient@@@@QAA@XZ @17723 NONAME
??0?$POrdinalDictionary@VPString@@@@IAA@HPBV0@@Z @17724 NONAME
??0?$POrdinalDictionary@VPString@@@@QAA@XZ @17725 NONAME
??0?$PSafePtr@VPMonitoredSockets@@@@QAA@ABV0@@Z @17726 NONAME
??0?$PScalarArray@F@@QAA@H@Z @17727 NONAME
- ??0?$PScalarArray@G@@QAA@ABV0@@Z @17728 NONAME
??0?$PScalarArray@G@@QAA@H@Z @17729 NONAME
- ??0?$PScalarArray@G@@QAA@PBGHH@Z @17730 NONAME
??0?$PScalarArray@H@@QAA@ABV0@@Z @17731 NONAME
??0?$PScalarArray@H@@QAA@H@Z @17732 NONAME
??0?$PScalarArray@I@@QAA@ABV0@@Z @17733 NONAME
@@ -1116,7 +1116,7 @@
??0PASN_BitString@@QAA@IPBE@Z @18216 NONAME
??0PASN_BitString@@QAA@IW4TagClass@PASN_Object@@I@Z @18217 NONAME
??0PASN_BMPString@@QAA@ABV0@@Z @18218 NONAME
- ??0PASN_BMPString@@QAA@ABV?$PScalarArray@G@@@Z @18219 NONAME
+ ??0PASN_BMPString@@QAA@ABV?$PBaseArray@G@@@Z @25649 NONAME
??0PASN_BMPString@@QAA@IW4TagClass@PASN_Object@@@Z @18220 NONAME
??0PASN_BMPString@@QAA@PBD@Z @18221 NONAME
??0PASN_Boolean@@QAA@ABV0@@Z @18222 NONAME
@@ -1531,7 +1531,7 @@
??0PString@@IAA@HPBV0@@Z @18631 NONAME
??0PString@@QAA@ABV0@@Z @18632 NONAME
??0PString@@QAA@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @18633 NONAME
- ??0PString@@QAA@ABV?$PScalarArray@G@@@Z @18634 NONAME
+ ??0PString@@QAA@ABV?$PBaseArray@G@@@Z @25650 NONAME
??0PString@@QAA@D@Z @18635 NONAME
??0PString@@QAA@F@Z @18636 NONAME
??0PString@@QAA@G@Z @18637 NONAME
@@ -1956,6 +1956,7 @@
??1?$PList@VPSTUNUDPSocket@@@@UAA@XZ @19055 NONAME
??1?$PList@VPThread@@@@UAA@XZ @19056 NONAME
??1?$PList@VPTimer@@@@UAA@XZ @19057 NONAME
+ ??1?$PList@VRouteEntry@PIPSocket@@@@UAA@XZ @25651 NONAME
??1?$PNatMethodServiceDescriptor@VPSTUNClient@@@@UAA@XZ @19058 NONAME
??1?$POrdinalDictionary@VPString@@@@UAA@XZ @19059 NONAME
??1?$PSafePtr@VPMonitoredSockets@@@@UAA@XZ @19060 NONAME
@@ -2572,7 +2573,7 @@
??4PASN_Array@@QAAAAV0@ABV0@@Z @19669 NONAME
??4PASN_BitString@@QAAAAV0@ABV0@@Z @19670 NONAME
??4PASN_BMPString@@QAAAAV0@ABV0@@Z @19671 NONAME
- ??4PASN_BMPString@@QAAAAV0@ABV?$PScalarArray@G@@@Z @19672 NONAME
+ ??4PASN_BMPString@@QAAAAV0@ABV?$PBaseArray@G@@@Z @25652 NONAME
??4PASN_Boolean@@QAAAAV0@H@Z @19673 NONAME
??4PASN_Choice@@QAAAAV0@ABV0@@Z @19674 NONAME
??4PASN_ConstrainedObject@@QAAAAV0@ABV0@@Z @19675 NONAME
@@ -3335,6 +3336,7 @@
??_7?$PList@VPSTUNUDPSocket@@@@6B@ @3650 NONAME
??_7?$PList@VPThread@@@@6B@ @3651 NONAME
??_7?$PList@VPTimer@@@@6B@ @3652 NONAME
+ ??_7?$PList@VRouteEntry@PIPSocket@@@@6B@ @25653 NONAME
??_7?$PNatMethodServiceDescriptor@VPSTUNClient@@@@6B@ @16898 NONAME
??_7?$POrdinalDictionary@VPString@@@@6B@ @3656 NONAME
??_7?$PSafePtr@VPMonitoredSockets@@@@6B@ @20369 NONAME
@@ -4121,6 +4123,7 @@
??_R0?AV?$PList@VPSTUNUDPSocket@@@@@8 @4705 NONAME
??_R0?AV?$PList@VPThread@@@@@8 @4706 NONAME
??_R0?AV?$PList@VPTimer@@@@@8 @4707 NONAME
+ ??_R0?AV?$PList@VRouteEntry@PIPSocket@@@@@8 @25654 NONAME
??_R0?AV?$PNatMethodServiceDescriptor@VPSTUNClient@@@@@8 @16907 NONAME
??_R0?AV?$POrdinalDictionary@VPString@@@@@8 @4711 NONAME
??_R0?AV?$PSafePtr@VPMonitoredSockets@@@@@8 @20486 NONAME
@@ -4700,6 +4703,7 @@
??_R1A@?0A@EA@?$PList@VPSTUNUDPSocket@@@@8 @5444 NONAME
??_R1A@?0A@EA@?$PList@VPThread@@@@8 @5445 NONAME
??_R1A@?0A@EA@?$PList@VPTimer@@@@8 @5446 NONAME
+ ??_R1A@?0A@EA@?$PList@VRouteEntry@PIPSocket@@@@8 @25655 NONAME
??_R1A@?0A@EA@?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16915 NONAME
??_R1A@?0A@EA@?$POrdinalDictionary@VPString@@@@8 @5450 NONAME
??_R1A@?0A@EA@?$PSafePtr@VPMonitoredSockets@@@@8 @20527 NONAME
@@ -5303,6 +5307,7 @@
??_R2?$PList@VPSTUNUDPSocket@@@@8 @6234 NONAME
??_R2?$PList@VPThread@@@@8 @6235 NONAME
??_R2?$PList@VPTimer@@@@8 @6236 NONAME
+ ??_R2?$PList@VRouteEntry@PIPSocket@@@@8 @25656 NONAME
??_R2?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16924 NONAME
??_R2?$POrdinalDictionary@VPString@@@@8 @6240 NONAME
??_R2?$PSafePtr@VPMonitoredSockets@@@@8 @20572 NONAME
@@ -5872,6 +5877,7 @@
??_R3?$PList@VPSTUNUDPSocket@@@@8 @6991 NONAME
??_R3?$PList@VPThread@@@@8 @6992 NONAME
??_R3?$PList@VPTimer@@@@8 @6993 NONAME
+ ??_R3?$PList@VRouteEntry@PIPSocket@@@@8 @25657 NONAME
??_R3?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16932 NONAME
??_R3?$POrdinalDictionary@VPString@@@@8 @6997 NONAME
??_R3?$PSafePtr@VPMonitoredSockets@@@@8 @20613 NONAME
@@ -6441,6 +6447,7 @@
??_R4?$PList@VPSTUNUDPSocket@@@@6B@ @7743 NONAME
??_R4?$PList@VPThread@@@@6B@ @7744 NONAME
??_R4?$PList@VPTimer@@@@6B@ @7745 NONAME
+ ??_R4?$PList@VRouteEntry@PIPSocket@@@@6B@ @25658 NONAME
??_R4?$PNatMethodServiceDescriptor@VPSTUNClient@@@@6B@ @16940 NONAME
??_R4?$POrdinalDictionary@VPString@@@@6B@ @7749 NONAME
??_R4?$PSafePtr@VPMonitoredSockets@@@@6B@ @20659 NONAME
@@ -7182,7 +7189,7 @@
?AsString@PURL@@QBA?AVPString@@W4UrlFormat@1@@Z @20872 NONAME
?AsString@PURLLegacyScheme@@UBA?AVPString@@W4UrlFormat@PURL@@ABV4@@Z @20873 NONAME
?AssureConnect@PHTTPClient@@IAAHABVPURL@@AAVPMIMEInfo@@@Z @20874 NONAME
- ?AsUCS2@PString@@QBA?AV?$PScalarArray@G@@XZ @20875 NONAME
+ ?AsUCS2@PString@@QBA?AV?$PBaseArray@G@@XZ @25659 NONAME
?AsUnsigned64@PString@@QBA_KI@Z @20876 NONAME
?AsUnsigned@PString@@QBAKI@Z @20877 NONAME
?ate@?$_Iosb@H@std@@2W4_Openmode@12@B @8721 NONAME
@@ -7356,6 +7363,7 @@
?Class@?$PList@VPSTUNUDPSocket@@@@SAPBDXZ @8939 NONAME
?Class@?$PList@VPThread@@@@SAPBDXZ @8940 NONAME
?Class@?$PList@VPTimer@@@@SAPBDXZ @8941 NONAME
+ ?Class@?$PList@VRouteEntry@PIPSocket@@@@SAPBDXZ @25660 NONAME
?Class@?$POrdinalDictionary@VPString@@@@SAPBDXZ @8945 NONAME
?Class@?$PSafePtr@VPMonitoredSockets@@@@SAPBDXZ @20997 NONAME
?Class@?$PSet@VPString@@@@SAPBDXZ @8948 NONAME
@@ -7682,6 +7690,7 @@
?Clone@?$PList@VPSTUNUDPSocket@@@@UBAPAVPObject@@XZ @21086 NONAME
?Clone@?$PList@VPThread@@@@UBAPAVPObject@@XZ @21087 NONAME
?Clone@?$PList@VPTimer@@@@UBAPAVPObject@@XZ @21088 NONAME
+ ?Clone@?$PList@VRouteEntry@PIPSocket@@@@UBAPAVPObject@@XZ @25661 NONAME
?Clone@?$POrdinalDictionary@VPString@@@@UBAPAVPObject@@XZ @21089 NONAME
?Clone@?$PSet@VPString@@@@UBAPAVPObject@@XZ @21090 NONAME
?Clone@?$PSortedList@VNAPTRRecord@PDNS@@@@UBAPAVPObject@@XZ @21091 NONAME
@@ -7897,6 +7906,7 @@
?CompareObjectMemoryDirect@?$PList@VPSTUNUDPSocket@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21301 NONAME
?CompareObjectMemoryDirect@?$PList@VPThread@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21302 NONAME
?CompareObjectMemoryDirect@?$PList@VPTimer@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21303 NONAME
+ ?CompareObjectMemoryDirect@?$PList@VRouteEntry@PIPSocket@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @25662 NONAME
?CompareObjectMemoryDirect@?$POrdinalDictionary@VPString@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21304 NONAME
?CompareObjectMemoryDirect@?$PSafePtr@VPMonitoredSockets@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21305 NONAME
?CompareObjectMemoryDirect@?$PSet@VPString@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21306 NONAME
@@ -9091,6 +9101,7 @@
?GetClass@?$PList@VPSTUNUDPSocket@@@@UBAPBDI@Z @22385 NONAME
?GetClass@?$PList@VPThread@@@@UBAPBDI@Z @22386 NONAME
?GetClass@?$PList@VPTimer@@@@UBAPBDI@Z @22387 NONAME
+ ?GetClass@?$PList@VRouteEntry@PIPSocket@@@@UBAPBDI@Z @25663 NONAME
?GetClass@?$POrdinalDictionary@VPString@@@@UBAPBDI@Z @22388 NONAME
?GetClass@?$PSafePtr@VPMonitoredSockets@@@@UBAPBDI@Z @22389 NONAME
?GetClass@?$PSet@VPString@@@@UBAPBDI@Z @22390 NONAME
@@ -9408,6 +9419,13 @@
?GetDescription@PWAVFileFormatG7231_ms@@UBA?AVPString@@XZ @22691 NONAME
?GetDescription@PWAVFileFormatG7231_vivo@@UBA?AVPString@@XZ @22692 NONAME
?GetDescription@PWAVFileFormatPCM@@UBA?AVPString@@XZ @22693 NONAME
+ ?GetDeviceCapabilities@?$PVideoInputPluginServiceDescriptor@VPVideoInputDevice_FakeVideo@@@@UBA_NABVPString@@PAX@Z @25664 NONAME
+ ?GetDeviceCapabilities@?$PVideoInputPluginServiceDescriptor@VPVideoInputDevice_VideoForWindows@@@@UBA_NABVPString@@PAX@Z @25665 NONAME
+ ?GetDeviceCapabilities@PDevicePluginServiceDescriptor@@UBA_NABVPString@@PAX@Z @25666 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice@@SAHABVPString@@0PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@PAVPPluginManager@@@Z @25667 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@PAVPPluginManager@@@Z @25668 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice_FakeVideo@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@@Z @25669 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice_VideoForWindows@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@@Z @25670 NONAME
?GetDeviceID@PSoundChannelWin32@@AAAHABVPString@@W4Directions@PSoundChannel@@AAI@Z @22694 NONAME
?GetDeviceNames@?$PNatMethodServiceDescriptor@VPSTUNClient@@@@UBA?AVPStringList@@H@Z @22695 NONAME
?GetDeviceNames@?$PSoundChannelPluginServiceDescriptor@VPSoundChannelWin32@@@@UBA?AVPStringList@@H@Z @22696 NONAME
@@ -9604,6 +9622,7 @@
?GetInteger@PWin32AsnAny@@QAAHAAJ@Z @22844 NONAME
?GetInterface@PIPSocket@@SA?AVPString@@VAddress@1@@Z @11619 NONAME
?GetInterface@PMonitoredSocketChannel@@QAAABVPString@@XZ @22845 NONAME
+ ?GetInterface@RouteEntry@PIPSocket@@QBAABVPString@@XZ @25671 NONAME
?GetInterfaceAddress@PWin32SnmpLibrary@@QAA?AVAddress@PIPSocket@@H@Z @22846 NONAME
?GetInterfaceInfo@PInterfaceMonitor@@QAAHABVPString@@AAVInterfaceEntry@PIPSocket@@@Z @22847 NONAME
?GetInterfaceInfo@PInterfaceMonitorClient@@UAAHABVPString@@AAVInterfaceEntry@PIPSocket@@@Z @22848 NONAME
@@ -9726,6 +9745,8 @@
?GetNatTypeString@PSTUNClient@@SA?AVPString@@W4NatTypes@1@@Z @11749 NONAME
?GetNest@PReadWriteMutex@@IBAPAVNest@1@XZ @22948 NONAME
?GetNetMask@InterfaceEntry@PIPSocket@@QBA?AVAddress@2@XZ @22949 NONAME
+ ?GetNetMask@RouteEntry@PIPSocket@@QBA?AVAddress@2@XZ @25672 NONAME
+ ?GetNetwork@RouteEntry@PIPSocket@@QBA?AVAddress@2@XZ @25673 NONAME
?GetNetworkInterface@PIPSocket@@SAHAAVAddress@1@@Z @11752 NONAME
?GetNext@MXRecordList@PDNS@@QAAPAVMXRecord@2@XZ @22950 NONAME
?GetNext@NAPTRRecordList@PDNS@@QAAPAVNAPTRRecord@2@PBD@Z @22951 NONAME
@@ -9801,6 +9822,7 @@
?GetPluginDirs@PPluginManager@@SA?AVPStringArray@@XZ @11861 NONAME
?GetPluginList@PPluginModuleManager@@UBA?AV?$PDictionary@VPString@@VPDynaLink@@@@XZ @23011 NONAME
?GetPluginManager@PPluginManager@@SAAAV1@XZ @11863 NONAME
+ ?GetPluginsDeviceCapabilities@PPluginManager@@QBAHABVPString@@00PAX@Z @25674 NONAME
?GetPluginsDeviceNames@PPluginManager@@QBA?AVPStringList@@ABVPString@@0H@Z @23012 NONAME
?GetPluginsProviding@PPluginManager@@QBA?AVPStringList@@ABVPString@@@Z @23013 NONAME
?GetPluginTypes@PPluginManager@@QBA?AVPStringList@@XZ @23014 NONAME
@@ -9870,6 +9892,7 @@
?GetReturnCode@PPipeChannel@@QBAHXZ @23074 NONAME
?GetRoot@PDirectory@@QBA?AV1@XZ @23075 NONAME
?GetRouteAddress@PIPSocket@@SA?AVAddress@1@V21@@Z @11949 NONAME
+ ?GetRouteInterfaceAddress@PIPSocket@@SA?AVAddress@1@V21@@Z @25675 NONAME
?GetRouteTable@PIPSocket@@SAHAAV?$PList@VRouteEntry@PIPSocket@@@@@Z @11950 NONAME
?GetSampleRate@PSound@@QBAIXZ @23076 NONAME
?GetSampleRate@PSoundChannel@@UBAIXZ @23077 NONAME
@@ -10223,6 +10246,7 @@
?InternalIsDescendant@?$PList@VPSTUNUDPSocket@@@@UBAHPBD@Z @23404 NONAME
?InternalIsDescendant@?$PList@VPThread@@@@UBAHPBD@Z @23405 NONAME
?InternalIsDescendant@?$PList@VPTimer@@@@UBAHPBD@Z @23406 NONAME
+ ?InternalIsDescendant@?$PList@VRouteEntry@PIPSocket@@@@UBAHPBD@Z @25676 NONAME
?InternalIsDescendant@?$POrdinalDictionary@VPString@@@@UBAHPBD@Z @23407 NONAME
?InternalIsDescendant@?$PSafePtr@VPMonitoredSockets@@@@UBAHPBD@Z @23408 NONAME
?InternalIsDescendant@?$PSet@VPString@@@@UBAHPBD@Z @23409 NONAME
@@ -10936,6 +10960,8 @@
?OnSyntaxError@PFTPServer@@UAAXH@Z @24091 NONAME
?OnSYST@PFTPServer@@UAAHABVPCaselessString@@@Z @24092 NONAME
?OnTextData@PSMTPServer@@MAAHAAVPCharArray@@AAH@Z @24093 NONAME
+ ?OnThreadEnded@PProcess@@UAAXAAVPThread@@@Z @25677 NONAME
+ ?OnThreadStart@PProcess@@UAAXAAVPThread@@@Z @25678 NONAME
?OnTimeout@PTimer@@UAAXXZ @24094 NONAME
?OnTOP@PPOP3Server@@MAAXHH@Z @24095 NONAME
?OnTURN@PSMTPServer@@MAAXXZ @24096 NONAME
@@ -11583,7 +11609,7 @@
?SetChannel@PVideoInputDevice_FakeVideo@@UAAHH@Z @24648 NONAME
?SetChannel@PVideoInputDevice_YUVFile@@UAAHH@Z @24649 NONAME
?SetChannels@PWAVFile@@UAAXI@Z @24650 NONAME
- ?SetCharacterSet@PASN_BMPString@@QAAXW4ConstraintType@PASN_Object@@ABV?$PScalarArray@G@@@Z @24651 NONAME
+ ?SetCharacterSet@PASN_BMPString@@QAAXW4ConstraintType@PASN_Object@@ABV?$PBaseArray@G@@@Z @25679 NONAME
?SetCharacterSet@PASN_BMPString@@UAAXW4ConstraintType@PASN_Object@@II@Z @24652 NONAME
?SetCharacterSet@PASN_BMPString@@UAAXW4ConstraintType@PASN_Object@@PBD@Z @24653 NONAME
?SetCharacterSet@PASN_ConstrainedString@@QAAXPBDHW4ConstraintType@PASN_Object@@@Z @24654 NONAME
@@ -11797,7 +11823,7 @@
?SetURLSpace@PHTTPServer@@QAAXABVPHTTPSpace@@@Z @24851 NONAME
?SetUserName@PProcess@@QAAHABVPString@@H@Z @24852 NONAME
?SetUserName@PURL@@QAAXABVPString@@@Z @24853 NONAME
- ?SetValue@PASN_BMPString@@QAAXABV?$PScalarArray@G@@@Z @24854 NONAME
+ ?SetValue@PASN_BMPString@@QAAXABV?$PBaseArray@G@@@Z @25680 NONAME
?SetValue@PASN_BMPString@@QAAXPBD@Z @24855 NONAME
?SetValue@PASN_ConstrainedString@@QAAXABVPString@@@Z @24856 NONAME
?SetValue@PASN_ConstrainedString@@QAAXPBD@Z @24857 NONAME
Modified: ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf 2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlib_2005_wm6.dtf 2007-11-10 02:07:02 UTC (rev 18828)
@@ -620,14 +620,14 @@
??0?$PList@VPThread@@@@QAA@XZ @17720 NONAME
??0?$PList@VPTimer@@@@IAA@HPBV0@@Z @17721 NONAME
??0?$PList@VPTimer@@@@QAA@XZ @17722 NONAME
+ ??0?$PList@VRouteEntry@PIPSocket@@@@IAA@HPBV0@@Z @25645 NONAME
+ ??0?$PList@VRouteEntry@PIPSocket@@@@QAA@XZ @25646 NONAME
??0?$PNatMethodServiceDescriptor@VPSTUNClient@@@@QAA@XZ @17723 NONAME
??0?$POrdinalDictionary@VPString@@@@IAA@HPBV0@@Z @17724 NONAME
??0?$POrdinalDictionary@VPString@@@@QAA@XZ @17725 NONAME
??0?$PSafePtr@VPMonitoredSockets@@@@QAA@ABV0@@Z @17726 NONAME
??0?$PScalarArray@F@@QAA@H@Z @17727 NONAME
- ??0?$PScalarArray@G@@QAA@ABV0@@Z @17728 NONAME
??0?$PScalarArray@G@@QAA@H@Z @17729 NONAME
- ??0?$PScalarArray@G@@QAA@PBGHH@Z @17730 NONAME
??0?$PScalarArray@H@@QAA@ABV0@@Z @17731 NONAME
??0?$PScalarArray@H@@QAA@H@Z @17732 NONAME
??0?$PScalarArray@I@@QAA@ABV0@@Z @17733 NONAME
@@ -1116,7 +1116,7 @@
??0PASN_BitString@@QAA@IPBE@Z @18216 NONAME
??0PASN_BitString@@QAA@IW4TagClass@PASN_Object@@I@Z @18217 NONAME
??0PASN_BMPString@@QAA@ABV0@@Z @18218 NONAME
- ??0PASN_BMPString@@QAA@ABV?$PScalarArray@G@@@Z @18219 NONAME
+ ??0PASN_BMPString@@QAA@ABV?$PBaseArray@G@@@Z @25647 NONAME
??0PASN_BMPString@@QAA@IW4TagClass@PASN_Object@@@Z @18220 NONAME
??0PASN_BMPString@@QAA@PBD@Z @18221 NONAME
??0PASN_Boolean@@QAA@ABV0@@Z @18222 NONAME
@@ -1531,7 +1531,7 @@
??0PString@@IAA@HPBV0@@Z @18631 NONAME
??0PString@@QAA@ABV0@@Z @18632 NONAME
??0PString@@QAA@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @18633 NONAME
- ??0PString@@QAA@ABV?$PScalarArray@G@@@Z @18634 NONAME
+ ??0PString@@QAA@ABV?$PBaseArray@G@@@Z @25648 NONAME
??0PString@@QAA@D@Z @18635 NONAME
??0PString@@QAA@F@Z @18636 NONAME
??0PString@@QAA@G@Z @18637 NONAME
@@ -1956,6 +1956,7 @@
??1?$PList@VPSTUNUDPSocket@@@@UAA@XZ @19055 NONAME
??1?$PList@VPThread@@@@UAA@XZ @19056 NONAME
??1?$PList@VPTimer@@@@UAA@XZ @19057 NONAME
+ ??1?$PList@VRouteEntry@PIPSocket@@@@UAA@XZ @25649 NONAME
??1?$PNatMethodServiceDescriptor@VPSTUNClient@@@@UAA@XZ @19058 NONAME
??1?$POrdinalDictionary@VPString@@@@UAA@XZ @19059 NONAME
??1?$PSafePtr@VPMonitoredSockets@@@@UAA@XZ @19060 NONAME
@@ -2572,7 +2573,7 @@
??4PASN_Array@@QAAAAV0@ABV0@@Z @19669 NONAME
??4PASN_BitString@@QAAAAV0@ABV0@@Z @19670 NONAME
??4PASN_BMPString@@QAAAAV0@ABV0@@Z @19671 NONAME
- ??4PASN_BMPString@@QAAAAV0@ABV?$PScalarArray@G@@@Z @19672 NONAME
+ ??4PASN_BMPString@@QAAAAV0@ABV?$PBaseArray@G@@@Z @25650 NONAME
??4PASN_Boolean@@QAAAAV0@H@Z @19673 NONAME
??4PASN_Choice@@QAAAAV0@ABV0@@Z @19674 NONAME
??4PASN_ConstrainedObject@@QAAAAV0@ABV0@@Z @19675 NONAME
@@ -3335,6 +3336,7 @@
??_7?$PList@VPSTUNUDPSocket@@@@6B@ @3650 NONAME
??_7?$PList@VPThread@@@@6B@ @3651 NONAME
??_7?$PList@VPTimer@@@@6B@ @3652 NONAME
+ ??_7?$PList@VRouteEntry@PIPSocket@@@@6B@ @25651 NONAME
??_7?$PNatMethodServiceDescriptor@VPSTUNClient@@@@6B@ @16898 NONAME
??_7?$POrdinalDictionary@VPString@@@@6B@ @3656 NONAME
??_7?$PSafePtr@VPMonitoredSockets@@@@6B@ @20369 NONAME
@@ -4121,6 +4123,7 @@
??_R0?AV?$PList@VPSTUNUDPSocket@@@@@8 @4705 NONAME
??_R0?AV?$PList@VPThread@@@@@8 @4706 NONAME
??_R0?AV?$PList@VPTimer@@@@@8 @4707 NONAME
+ ??_R0?AV?$PList@VRouteEntry@PIPSocket@@@@@8 @25652 NONAME
??_R0?AV?$PNatMethodServiceDescriptor@VPSTUNClient@@@@@8 @16907 NONAME
??_R0?AV?$POrdinalDictionary@VPString@@@@@8 @4711 NONAME
??_R0?AV?$PSafePtr@VPMonitoredSockets@@@@@8 @20486 NONAME
@@ -4700,6 +4703,7 @@
??_R1A@?0A@EA@?$PList@VPSTUNUDPSocket@@@@8 @5444 NONAME
??_R1A@?0A@EA@?$PList@VPThread@@@@8 @5445 NONAME
??_R1A@?0A@EA@?$PList@VPTimer@@@@8 @5446 NONAME
+ ??_R1A@?0A@EA@?$PList@VRouteEntry@PIPSocket@@@@8 @25653 NONAME
??_R1A@?0A@EA@?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16915 NONAME
??_R1A@?0A@EA@?$POrdinalDictionary@VPString@@@@8 @5450 NONAME
??_R1A@?0A@EA@?$PSafePtr@VPMonitoredSockets@@@@8 @20527 NONAME
@@ -5303,6 +5307,7 @@
??_R2?$PList@VPSTUNUDPSocket@@@@8 @6234 NONAME
??_R2?$PList@VPThread@@@@8 @6235 NONAME
??_R2?$PList@VPTimer@@@@8 @6236 NONAME
+ ??_R2?$PList@VRouteEntry@PIPSocket@@@@8 @25654 NONAME
??_R2?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16924 NONAME
??_R2?$POrdinalDictionary@VPString@@@@8 @6240 NONAME
??_R2?$PSafePtr@VPMonitoredSockets@@@@8 @20572 NONAME
@@ -5872,6 +5877,7 @@
??_R3?$PList@VPSTUNUDPSocket@@@@8 @6991 NONAME
??_R3?$PList@VPThread@@@@8 @6992 NONAME
??_R3?$PList@VPTimer@@@@8 @6993 NONAME
+ ??_R3?$PList@VRouteEntry@PIPSocket@@@@8 @25655 NONAME
??_R3?$PNatMethodServiceDescriptor@VPSTUNClient@@@@8 @16932 NONAME
??_R3?$POrdinalDictionary@VPString@@@@8 @6997 NONAME
??_R3?$PSafePtr@VPMonitoredSockets@@@@8 @20613 NONAME
@@ -6441,6 +6447,7 @@
??_R4?$PList@VPSTUNUDPSocket@@@@6B@ @7743 NONAME
??_R4?$PList@VPThread@@@@6B@ @7744 NONAME
??_R4?$PList@VPTimer@@@@6B@ @7745 NONAME
+ ??_R4?$PList@VRouteEntry@PIPSocket@@@@6B@ @25656 NONAME
??_R4?$PNatMethodServiceDescriptor@VPSTUNClient@@@@6B@ @16940 NONAME
??_R4?$POrdinalDictionary@VPString@@@@6B@ @7749 NONAME
??_R4?$PSafePtr@VPMonitoredSockets@@@@6B@ @20659 NONAME
@@ -7182,7 +7189,7 @@
?AsString@PURL@@QBA?AVPString@@W4UrlFormat@1@@Z @20872 NONAME
?AsString@PURLLegacyScheme@@UBA?AVPString@@W4UrlFormat@PURL@@ABV4@@Z @20873 NONAME
?AssureConnect@PHTTPClient@@IAAHABVPURL@@AAVPMIMEInfo@@@Z @20874 NONAME
- ?AsUCS2@PString@@QBA?AV?$PScalarArray@G@@XZ @20875 NONAME
+ ?AsUCS2@PString@@QBA?AV?$PBaseArray@G@@XZ @25657 NONAME
?AsUnsigned64@PString@@QBA_KI@Z @20876 NONAME
?AsUnsigned@PString@@QBAKI@Z @20877 NONAME
?ate@?$_Iosb@H@std@@2W4_Openmode@12@B @8721 NONAME
@@ -7356,6 +7363,7 @@
?Class@?$PList@VPSTUNUDPSocket@@@@SAPBDXZ @8939 NONAME
?Class@?$PList@VPThread@@@@SAPBDXZ @8940 NONAME
?Class@?$PList@VPTimer@@@@SAPBDXZ @8941 NONAME
+ ?Class@?$PList@VRouteEntry@PIPSocket@@@@SAPBDXZ @25658 NONAME
?Class@?$POrdinalDictionary@VPString@@@@SAPBDXZ @8945 NONAME
?Class@?$PSafePtr@VPMonitoredSockets@@@@SAPBDXZ @20997 NONAME
?Class@?$PSet@VPString@@@@SAPBDXZ @8948 NONAME
@@ -7682,6 +7690,7 @@
?Clone@?$PList@VPSTUNUDPSocket@@@@UBAPAVPObject@@XZ @21086 NONAME
?Clone@?$PList@VPThread@@@@UBAPAVPObject@@XZ @21087 NONAME
?Clone@?$PList@VPTimer@@@@UBAPAVPObject@@XZ @21088 NONAME
+ ?Clone@?$PList@VRouteEntry@PIPSocket@@@@UBAPAVPObject@@XZ @25659 NONAME
?Clone@?$POrdinalDictionary@VPString@@@@UBAPAVPObject@@XZ @21089 NONAME
?Clone@?$PSet@VPString@@@@UBAPAVPObject@@XZ @21090 NONAME
?Clone@?$PSortedList@VNAPTRRecord@PDNS@@@@UBAPAVPObject@@XZ @21091 NONAME
@@ -7897,6 +7906,7 @@
?CompareObjectMemoryDirect@?$PList@VPSTUNUDPSocket@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21301 NONAME
?CompareObjectMemoryDirect@?$PList@VPThread@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21302 NONAME
?CompareObjectMemoryDirect@?$PList@VPTimer@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21303 NONAME
+ ?CompareObjectMemoryDirect@?$PList@VRouteEntry@PIPSocket@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @25660 NONAME
?CompareObjectMemoryDirect@?$POrdinalDictionary@VPString@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21304 NONAME
?CompareObjectMemoryDirect@?$PSafePtr@VPMonitoredSockets@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21305 NONAME
?CompareObjectMemoryDirect@?$PSet@VPString@@@@UBA?AW4Comparison@PObject@@ABV3@@Z @21306 NONAME
@@ -9091,6 +9101,7 @@
?GetClass@?$PList@VPSTUNUDPSocket@@@@UBAPBDI@Z @22385 NONAME
?GetClass@?$PList@VPThread@@@@UBAPBDI@Z @22386 NONAME
?GetClass@?$PList@VPTimer@@@@UBAPBDI@Z @22387 NONAME
+ ?GetClass@?$PList@VRouteEntry@PIPSocket@@@@UBAPBDI@Z @25661 NONAME
?GetClass@?$POrdinalDictionary@VPString@@@@UBAPBDI@Z @22388 NONAME
?GetClass@?$PSafePtr@VPMonitoredSockets@@@@UBAPBDI@Z @22389 NONAME
?GetClass@?$PSet@VPString@@@@UBAPBDI@Z @22390 NONAME
@@ -9408,6 +9419,13 @@
?GetDescription@PWAVFileFormatG7231_ms@@UBA?AVPString@@XZ @22691 NONAME
?GetDescription@PWAVFileFormatG7231_vivo@@UBA?AVPString@@XZ @22692 NONAME
?GetDescription@PWAVFileFormatPCM@@UBA?AVPString@@XZ @22693 NONAME
+ ?GetDeviceCapabilities@?$PVideoInputPluginServiceDescriptor@VPVideoInputDevice_FakeVideo@@@@UBA_NABVPString@@PAX@Z @25662 NONAME
+ ?GetDeviceCapabilities@?$PVideoInputPluginServiceDescriptor@VPVideoInputDevice_VideoForWindows@@@@UBA_NABVPString@@PAX@Z @25663 NONAME
+ ?GetDeviceCapabilities@PDevicePluginServiceDescriptor@@UBA_NABVPString@@PAX@Z @25664 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice@@SAHABVPString@@0PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@PAVPPluginManager@@@Z @25665 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@PAVPPluginManager@@@Z @25666 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice_FakeVideo@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@@Z @25667 NONAME
+ ?GetDeviceCapabilities@PVideoInputDevice_VideoForWindows@@SAHABVPString@@PAV?$list@UInputDeviceCapability@@V?$allocator@UInputDeviceCapability@@@std@@@std@@@Z @25668 NONAME
?GetDeviceID@PSoundChannelWin32@@AAAHABVPString@@W4Directions@PSoundChannel@@AAI@Z @22694 NONAME
?GetDeviceNames@?$PNatMethodServiceDescriptor@VPSTUNClient@@@@UBA?AVPStringList@@H@Z @22695 NONAME
?GetDeviceNames@?$PSoundChannelPluginServiceDescriptor@VPSoundChannelWin32@@@@UBA?AVPStringList@@H@Z @22696 NONAME
@@ -9604,6 +9622,7 @@
?GetInteger@PWin32AsnAny@@QAAHAAJ@Z @22844 NONAME
?GetInterface@PIPSocket@@SA?AVPString@@VAddress@1@@Z @11619 NONAME
?GetInterface@PMonitoredSocketChannel@@QAAABVPString@@XZ @22845 NONAME
+ ?GetInterface@RouteEntry@PIPSocket@@QBAABVPString@@XZ @25669 NONAME
?GetInterfaceAddress@PWin32SnmpLibrary@@QAA?AVAddress@PIPSocket@@H@Z @22846 NONAME
?GetInterfaceInfo@PInterfaceMonitor@@QAAHABVPString@@AAVInterfaceEntry@PIPSocket@@@Z @22847 NONAME
?GetInterfaceInfo@PInterfaceMonitorClient@@UAAHABVPString@@AAVInterfaceEntry@PIPSocket@@@Z @22848 NONAME
@@ -9726,6 +9745,8 @@
?GetNatTypeString@PSTUNClient@@SA?AVPString@@W4NatTypes@1@@Z @11749 NONAME
?GetNest@PReadWriteMutex@@IBAPAVNest@1@XZ @22948 NONAME
?GetNetMask@InterfaceEntry@PIPSocket@@QBA?AVAddress@2@XZ @22949 NONAME
+ ?GetNetMask@RouteEntry@PIPSocket@@QBA?AVAddress@2@XZ @25670 NONAME
+ ?GetNetwork@RouteEntry@PIPSocket@@QBA?AVAddress@2@XZ @25671 NONAME
?GetNetworkInterface@PIPSocket@@SAHAAVAddress@1@@Z @11752 NONAME
?GetNext@MXRecordList@PDNS@@QAAPAVMXRecord@2@XZ @22950 NONAME
?GetNext@NAPTRRecordList@PDNS@@QAAPAVNAPTRRecord@2@PBD@Z @22951 NONAME
@@ -9801,6 +9822,7 @@
?GetPluginDirs@PPluginManager@@SA?AVPStringArray@@XZ @11861 NONAME
?GetPluginList@PPluginModuleManager@@UBA?AV?$PDictionary@VPString@@VPDynaLink@@@@XZ @23011 NONAME
?GetPluginManager@PPluginManager@@SAAAV1@XZ @11863 NONAME
+ ?GetPluginsDeviceCapabilities@PPluginManager@@QBAHABVPString@@00PAX@Z @25672 NONAME
?GetPluginsDeviceNames@PPluginManager@@QBA?AVPStringList@@ABVPString@@0H@Z @23012 NONAME
?GetPluginsProviding@PPluginManager@@QBA?AVPStringList@@ABVPString@@@Z @23013 NONAME
?GetPluginTypes@PPluginManager@@QBA?AVPStringList@@XZ @23014 NONAME
@@ -9870,6 +9892,7 @@
?GetReturnCode@PPipeChannel@@QBAHXZ @23074 NONAME
?GetRoot@PDirectory@@QBA?AV1@XZ @23075 NONAME
?GetRouteAddress@PIPSocket@@SA?AVAddress@1@V21@@Z @11949 NONAME
+ ?GetRouteInterfaceAddress@PIPSocket@@SA?AVAddress@1@V21@@Z @25673 NONAME
?GetRouteTable@PIPSocket@@SAHAAV?$PList@VRouteEntry@PIPSocket@@@@@Z @11950 NONAME
?GetSampleRate@PSound@@QBAIXZ @23076 NONAME
?GetSampleRate@PSoundChannel@@UBAIXZ @23077 NONAME
@@ -10223,6 +10246,7 @@
?InternalIsDescendant@?$PList@VPSTUNUDPSocket@@@@UBAHPBD@Z @23404 NONAME
?InternalIsDescendant@?$PList@VPThread@@@@UBAHPBD@Z @23405 NONAME
?InternalIsDescendant@?$PList@VPTimer@@@@UBAHPBD@Z @23406 NONAME
+ ?InternalIsDescendant@?$PList@VRouteEntry@PIPSocket@@@@UBAHPBD@Z @25674 NONAME
?InternalIsDescendant@?$POrdinalDictionary@VPString@@@@UBAHPBD@Z @23407 NONAME
?InternalIsDescendant@?$PSafePtr@VPMonitoredSockets@@@@UBAHPBD@Z @23408 NONAME
?InternalIsDescendant@?$PSet@VPString@@@@UBAHPBD@Z @23409 NONAME
@@ -10936,6 +10960,8 @@
?OnSyntaxError@PFTPServer@@UAAXH@Z @24091 NONAME
?OnSYST@PFTPServer@@UAAHABVPCaselessString@@@Z @24092 NONAME
?OnTextData@PSMTPServer@@MAAHAAVPCharArray@@AAH@Z @24093 NONAME
+ ?OnThreadEnded@PProcess@@UAAXAAVPThread@@@Z @25675 NONAME
+ ?OnThreadStart@PProcess@@UAAXAAVPThread@@@Z @25676 NONAME
?OnTimeout@PTimer@@UAAXXZ @24094 NONAME
?OnTOP@PPOP3Server@@MAAXHH@Z @24095 NONAME
?OnTURN@PSMTPServer@@MAAXXZ @24096 NONAME
@@ -11583,7 +11609,7 @@
?SetChannel@PVideoInputDevice_FakeVideo@@UAAHH@Z @24648 NONAME
?SetChannel@PVideoInputDevice_YUVFile@@UAAHH@Z @24649 NONAME
?SetChannels@PWAVFile@@UAAXI@Z @24650 NONAME
- ?SetCharacterSet@PASN_BMPString@@QAAXW4ConstraintType@PASN_Object@@ABV?$PScalarArray@G@@@Z @24651 NONAME
+ ?SetCharacterSet@PASN_BMPString@@QAAXW4ConstraintType@PASN_Object@@ABV?$PBaseArray@G@@@Z @25677 NONAME
?SetCharacterSet@PASN_BMPString@@UAAXW4ConstraintType@PASN_Object@@II@Z @24652 NONAME
?SetCharacterSet@PASN_BMPString@@UAAXW4ConstraintType@PASN_Object@@PBD@Z @24653 NONAME
?SetCharacterSet@PASN_ConstrainedString@@QAAXPBDHW4ConstraintType@PASN_Object@@@Z @24654 NONAME
@@ -11797,7 +11823,7 @@
?SetURLSpace@PHTTPServer@@QAAXABVPHTTPSpace@@@Z @24851 NONAME
?SetUserName@PProcess@@QAAHABVPString@@H@Z @24852 NONAME
?SetUserName@PURL@@QAAXABVPString@@@Z @24853 NONAME
- ?SetValue@PASN_BMPString@@QAAXABV?$PScalarArray@G@@@Z @24854 NONAME
+ ?SetValue@PASN_BMPString@@QAAXABV?$PBaseArray@G@@@Z @25678 NONAME
?SetValue@PASN_BMPString@@QAAXPBD@Z @24855 NONAME
?SetValue@PASN_ConstrainedString@@QAAXABVPString@@@Z @24856 NONAME
?SetValue@PASN_ConstrainedString@@QAAXPBD@Z @24857 NONAME
Modified: ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf 2007-11-09 06:52:50 UTC (rev 18827)
+++ ptlib/trunk/include/ptlib/msos/ptlibd_2005.dtf 2007-11-10 02:07:02 UTC (rev 18828)
@@ -691,7 +691,6 @@
??0?$PBaseArray@E@@QAE@PBEHH@Z @542 NONAME
??0?$PBaseArray@F@@QAE@H@Z @543 NONAME
??0?$PBaseArray@F@@QAE@PBFHH@Z @544 NONAME
- ??0?$PBaseArray@G@@QAE@ABV0@@Z @545 NONAME
??0?$PBaseArray@G@@QAE@H@Z @546 NONAME
??0?$PBaseArray@G@@QAE@PBGHH@Z @547 NONAME
??0?$PBaseArray@H@@QAE@ABV0@@Z @548 NONAME
@@ -713,6 +712,9 @@
??0?$PBaseArray@PAUPHashTableElement@@@@QAE@PBQAUPHashTableElement@@HH@Z @18663 NONAME
??0?$PBaseArray@PAVPObject@@@@QAE@H@Z @565 NONAME
??0?$PBaseArray@PAVPObject@@@@QAE@PBQAVPObject@@HH@Z @566 NONAME
+ ??0?$PBaseArray@_W@@QAE@ABV0@@Z @20514 NONAME
+ ??0?$PBaseArray@_W@@QAE@H@Z @20515 NONAME
+ ??0?$PBaseArray@_W@@QAE@PB_WHH@Z @20516 NONAME
??0?$PDevicePluginAdapter@VPSoundChannel@@@@QAE@...
[truncated message content] |
|
From: <sh...@us...> - 2007-11-13 14:21:00
|
Revision: 18858
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18858&view=rev
Author: shorne
Date: 2007-11-13 06:20:59 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Fix errors when compiling with exceptions thx David Sayada
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/src/ptlib/unix/assert.cxx
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2007-11-13 07:53:39 UTC (rev 18857)
+++ ptlib/trunk/configure 2007-11-13 14:20:59 UTC (rev 18858)
@@ -895,7 +895,7 @@
--enable-oss enable OSS audio support
--enable-memcheck enable leak testing code (off by default)
--disable-odbc disable ODBC support
- --exceptions enable C++ exceptions
+ --enable-exceptions enable C++ exceptions
Some influential environment variables:
CXX C++ compiler command
Modified: ptlib/trunk/src/ptlib/unix/assert.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/assert.cxx 2007-11-13 07:53:39 UTC (rev 18857)
+++ ptlib/trunk/src/ptlib/unix/assert.cxx 2007-11-13 14:20:59 UTC (rev 18858)
@@ -104,6 +104,7 @@
#include <ctype.h>
#include <signal.h>
+#include <stdexcept>
#include <ptlib/pprocess.h>
#ifndef __BEOS__
@@ -177,16 +178,18 @@
if (&trace != &PError)
PError << msg << endl;
+ char *env;
+
#if P_EXCEPTIONS
//Throw a runtime exception if the environment variable PWLIB_ASSERT_EXCEPTION is set
- char * env = ::getenv("PWLIB_ASSERT_EXCEPTION");
+ env = ::getenv("PWLIB_ASSERT_EXCEPTION");
if (env != NULL){
throw std::runtime_error(msg);
}
#endif
#ifndef P_VXWORKS
- char * env = ::getenv("PWLIB_ASSERT_ACTION");
+ env = ::getenv("PWLIB_ASSERT_ACTION");
if (env != NULL && *env != EOF && PAssertAction(*env, msg)) {
inAssert = FALSE;
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-11-16 04:24:00
|
Revision: 18873
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18873&view=rev
Author: rjongbloed
Date: 2007-11-15 20:24:04 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Added function to PStringToString dictionary which returns the dictionary as an array of C style strings, optionally of key=value form similar to shell environment, or adjacent strings in the array being key/value pairs.
Modified Paths:
--------------
ptlib/trunk/include/ptlib/pstring.h
ptlib/trunk/src/ptlib/common/contain.cxx
Modified: ptlib/trunk/include/ptlib/pstring.h
===================================================================
--- ptlib/trunk/include/ptlib/pstring.h 2007-11-16 01:00:21 UTC (rev 18872)
+++ ptlib/trunk/include/ptlib/pstring.h 2007-11-16 04:24:04 UTC (rev 18873)
@@ -2350,7 +2350,7 @@
PStringArray operator + (const PString & str);
/**Create an array of C strings.
- If storage is NULL then this returns a single pointer that may be
+ If storage is NULL then this returns a single pointer that must be
disposed of using free(). Note that each of the strings are part of the
same memory allocation so only one free() is required.
@@ -3045,6 +3045,23 @@
istream &strm // Stream to read the objects contents from.
);
//@}
+
+ /**Create an array of C strings.
+ If withEqualSign is true then array is GetSize()+1 strings of the form
+ key=value. If false then the array is GetSize()*2+1 strings where
+ consecutive pointers are the key and option respecitively of each
+ entry in the dictionary.
+
+ If storage is NULL then this returns a single pointer that must be
+ disposed of using free(). Note that each of the strings are part of the
+ same memory allocation so only one free() is required.
+
+ If storage is not null then that is used to allocate the memory.
+ */
+ char ** ToCharArray(
+ bool withEqualSign,
+ PCharArray * storage = NULL
+ ) const;
};
Modified: ptlib/trunk/src/ptlib/common/contain.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/contain.cxx 2007-11-16 01:00:21 UTC (rev 18872)
+++ ptlib/trunk/src/ptlib/common/contain.cxx 2007-11-16 04:24:04 UTC (rev 18873)
@@ -2857,6 +2857,13 @@
}
+static void strcpy_with_increment(char * & strPtr, const PString & str)
+{
+ PINDEX len = str.GetLength()+1;
+ memcpy(strPtr, (const char *)str, len);
+ strPtr += len;
+}
+
char ** PStringArray::ToCharArray(PCharArray * storage) const
{
PINDEX i;
@@ -2875,14 +2882,11 @@
if (storagePtr == NULL)
return NULL;
- char * strPtr = (char *)&storagePtr[GetSize()+1];
+ char * strPtr = (char *)&storagePtr[mySize+1];
for (i = 0; i < mySize; i++) {
storagePtr[i] = strPtr;
- const PString & str = (*this)[i];
- PINDEX len = str.GetLength()+1;
- memcpy(strPtr, (const char *)str, len);
- strPtr += len;
+ strcpy_with_increment(strPtr, (*this)[i]);
}
storagePtr[i] = NULL;
@@ -3176,6 +3180,45 @@
}
+char ** PStringToString::ToCharArray(bool withEqualSign, PCharArray * storage) const
+{
+ PINDEX i;
+
+ PINDEX mySize = GetSize();
+ PINDEX numPointers = mySize*(withEqualSign ? 1 : 2) + 1;
+ PINDEX storageSize = numPointers*sizeof(char *);
+ for (i = 0; i < mySize; i++)
+ storageSize += GetKeyAt(i).GetLength()+1 + GetDataAt(i).GetLength()+1;
+
+ char ** storagePtr;
+ if (storage != NULL)
+ storagePtr = (char **)storage->GetPointer(storageSize);
+ else
+ storagePtr = (char **)malloc(storageSize);
+
+ if (storagePtr == NULL)
+ return NULL;
+
+ char * strPtr = (char *)&storagePtr[numPointers];
+ PINDEX strIndex = 0;
+
+ for (i = 0; i < mySize; i++) {
+ storagePtr[strIndex++] = strPtr;
+ if (withEqualSign)
+ strcpy_with_increment(strPtr, GetKeyAt(i) + '=' + GetDataAt(i));
+ else {
+ strcpy_with_increment(strPtr, GetKeyAt(i));
+ storagePtr[strIndex++] = strPtr;
+ strcpy_with_increment(strPtr, GetDataAt(i));
+ }
+ }
+
+ storagePtr[strIndex] = NULL;
+
+ return storagePtr;
+}
+
+
///////////////////////////////////////////////////////////////////////////////
PRegularExpression::PRegularExpression()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hfr...@us...> - 2007-11-17 14:22:22
|
Revision: 18884
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18884&view=rev
Author: hfriederich
Date: 2007-11-17 06:22:22 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Add priorization to PInterfaceMonitorClient.
Add protection mechanism against pointers to deleted PSTUNClient instances.
Add method to invalidate PSTUNClient cache.
Modified Paths:
--------------
ptlib/trunk/include/ptclib/psockbun.h
ptlib/trunk/include/ptclib/pstun.h
ptlib/trunk/src/ptclib/psockbun.cxx
ptlib/trunk/src/ptclib/pstun.cxx
Modified: ptlib/trunk/include/ptclib/psockbun.h
===================================================================
--- ptlib/trunk/include/ptclib/psockbun.h 2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/include/ptclib/psockbun.h 2007-11-17 14:22:22 UTC (rev 18884)
@@ -172,6 +172,8 @@
void SetInterfaceFilter(PInterfaceFilter * filter);
virtual void RefreshInterfaceList();
+
+ void OnRemoveSTUNClient(const PSTUNClient *stun);
protected:
void UpdateThreadMain();
@@ -236,6 +238,12 @@
const PString & iface, /// Interface desciptor name
InterfaceEntry & info /// Information on the interface
);
+
+ /**Returns the priority of this client. A higher value means higher priority.
+ Higher priority clients get their callback functions called first. Clients
+ with the same priority get called in the order of their insertion.
+ */
+ virtual PINDEX GetPriority() const { return 50; }
protected:
/// Call back function for when an interface has been added to the system
@@ -243,6 +251,9 @@
/// Call back function for when an interface has been removed from the system
virtual void OnRemoveInterface(const InterfaceEntry & entry) = 0;
+
+ /// Called when a PSTUNClient is about to be destroyed
+ virtual void OnRemoveSTUNClient(const PSTUNClient *stun) {};
friend class PInterfaceMonitor;
};
@@ -352,6 +363,7 @@
);
protected:
+ virtual void OnRemoveSTUNClient(const PSTUNClient *stun);
struct SocketInfo {
SocketInfo()
: socket(NULL)
Modified: ptlib/trunk/include/ptclib/pstun.h
===================================================================
--- ptlib/trunk/include/ptclib/pstun.h 2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/include/ptclib/pstun.h 2007-11-17 14:22:22 UTC (rev 18884)
@@ -251,6 +251,12 @@
PIPSocket::Address & externalAddress, ///< External address of router
const PTimeInterval & maxAge = 1000 ///< Maximum age for caching
);
+
+ /**Invalidates the cached external address
+ This allows to lazily update the external address cache at the next
+ attempt to get the external address.
+ */
+ void InvalidateExternalAddressCache();
/**Create a single socket.
The STUN protocol is used to create a socket for which the external IP
Modified: ptlib/trunk/src/ptclib/psockbun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psockbun.cxx 2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/src/ptclib/psockbun.cxx 2007-11-17 14:22:22 UTC (rev 18884)
@@ -425,9 +425,18 @@
{
PWaitAndSignal m(mutex);
- if (currentClients.empty())
+ if (currentClients.empty()) {
Start();
- currentClients.push_back(client);
+ currentClients.push_back(client);
+ } else {
+ for (ClientList_T::iterator iter = currentClients.begin(); iter != currentClients.end(); ++iter) {
+ if ((*iter)->GetPriority() >= client->GetPriority()) {
+ currentClients.insert(iter, client);
+ return;
+ }
+ }
+ currentClients.push_back(client);
+ }
}
@@ -446,7 +455,7 @@
{
PWaitAndSignal m(mutex);
- for (ClientList_T::iterator iter = currentClients.begin(); iter != currentClients.end(); ++iter) {
+ for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
PInterfaceMonitorClient * client = *iter;
if (client->LockReadWrite()) {
client->OnAddInterface(entry);
@@ -460,7 +469,7 @@
{
PWaitAndSignal m(mutex);
- for (ClientList_T::iterator iter = currentClients.begin(); iter != currentClients.end(); ++iter) {
+ for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
PInterfaceMonitorClient * client = *iter;
if (client->LockReadWrite()) {
client->OnRemoveInterface(entry);
@@ -470,6 +479,20 @@
}
+void PInterfaceMonitor::OnRemoveSTUNClient(const PSTUNClient *stun)
+{
+ PWaitAndSignal m(mutex);
+
+ for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
+ PInterfaceMonitorClient *client = *iter;
+ if (client->LockReadWrite()) {
+ client->OnRemoveSTUNClient(stun);
+ client->UnlockReadWrite();
+ }
+ }
+}
+
+
//////////////////////////////////////////////////
PMonitoredSockets::PMonitoredSockets(BOOL reuseAddr, PSTUNClient * stunClient)
@@ -662,6 +685,13 @@
}
+void PMonitoredSockets::OnRemoveSTUNClient(const PSTUNClient *_stun)
+{
+ if (stun == _stun)
+ stun = NULL;
+}
+
+
//////////////////////////////////////////////////
PMonitoredSocketChannel::PMonitoredSocketChannel(const PMonitoredSocketsPtr & sock, BOOL shared)
Modified: ptlib/trunk/src/ptclib/pstun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pstun.cxx 2007-11-16 11:31:39 UTC (rev 18883)
+++ ptlib/trunk/src/ptclib/pstun.cxx 2007-11-17 14:22:22 UTC (rev 18884)
@@ -693,6 +693,12 @@
}
+void PSTUNClient::InvalidateExternalAddressCache() {
+ cachedExternalAddress = 0;
+ natType = UnknownNat;
+}
+
+
BOOL PSTUNClient::CreateSocket(PUDPSocket * & socket, const PIPSocket::Address & binding, WORD localPort)
{
socket = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dsa...@us...> - 2007-11-18 20:45:23
|
Revision: 18890
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18890&view=rev
Author: dsandras
Date: 2007-11-18 12:45:22 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Applied patch from Matthias Schneider <ma30002000 yahoo de> to fix
compilation with VFW disabled, and to fix several mingw warnings.
Modified Paths:
--------------
ptlib/trunk/include/ptlib/object.h
ptlib/trunk/include/ptlib/thread.h
ptlib/trunk/src/ptlib/common/pglobalstatic.cxx
Modified: ptlib/trunk/include/ptlib/object.h
===================================================================
--- ptlib/trunk/include/ptlib/object.h 2007-11-18 11:05:12 UTC (rev 18889)
+++ ptlib/trunk/include/ptlib/object.h 2007-11-18 20:45:22 UTC (rev 18890)
@@ -1377,8 +1377,8 @@
{ return strcmp(clsName, cls::Class()) == 0 || par::InternalIsDescendant(clsName); } \
virtual const char * GetClass(unsigned ancestor = 0) const \
{ return ancestor > 0 ? par::GetClass(ancestor-1) : cls::Class(); } \
- virtual Comparison CompareObjectMemoryDirect(const PObject & obj) const \
- { return (Comparison)memcmp(this, &obj, sizeof(cls)); } \
+ virtual Comparison CompareObjectMemoryDirect(const PObject & _obj) const \
+ { return (Comparison)memcmp(this, &_obj, sizeof(cls)); } \
PNEW_AND_DELETE_FUNCTIONS
Modified: ptlib/trunk/include/ptlib/thread.h
===================================================================
--- ptlib/trunk/include/ptlib/thread.h 2007-11-18 11:05:12 UTC (rev 18889)
+++ ptlib/trunk/include/ptlib/thread.h 2007-11-18 20:45:22 UTC (rev 18890)
@@ -517,7 +517,7 @@
friend class PProcess;
// So a PProcess can get at PThread() constructor but nothing else.
- PThread(const PThread &) { }
+ PThread(const PThread &) : PObject () { }
// Empty constructor to prevent copying of thread instances.
PThread & operator=(const PThread &) { return *this; }
@@ -573,11 +573,11 @@
PCLASSINFO(PThreadMain, PThread);
public:
typedef void (*FnType)();
- PThreadMain(FnType _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn)
+ PThreadMain(FnType _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn)
{ PThread::Resume(); }
- PThreadMain(const char * _file, int _line, FnType _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+ PThreadMain(const char * _file, int _line, FnType _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)), fn(_fn)
{ PThread::Resume(); }
virtual void Main()
@@ -603,12 +603,12 @@
PCLASSINFO(PThread1Arg, PThread);
public:
typedef void (*FnType)(Arg1Type arg1);
- PThread1Arg(Arg1Type _arg1, FnType _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
+ PThread1Arg(Arg1Type _arg1, FnType _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
arg1(_arg1)
{ PThread::Resume(); }
- PThread1Arg(const char * _file, int _line, Arg1Type _arg1, FnType _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+ PThread1Arg(const char * _file, int _line, Arg1Type _arg1, FnType _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)), fn(_fn),
arg1(_arg1)
{ PThread::Resume(); }
@@ -637,12 +637,12 @@
PCLASSINFO(PThread2Arg, PThread);
public:
typedef void (*FnType)(Arg1Type arg1, Arg2Type arg2);
- PThread2Arg(Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
+ PThread2Arg(Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread), fn(_fn),
arg1(_arg1), arg2(_arg2)
{ PThread::Resume(); }
- PThread2Arg(const char * _file, int _line, Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+ PThread2Arg(const char * _file, int _line, Arg1Type _arg1, Arg2Type _arg2, FnType _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)), fn(_fn),
arg1(_arg1), arg2(_arg2)
{ PThread::Resume(); }
@@ -676,12 +676,12 @@
PCLASSINFO(PThreadObj, PThread);
public:
typedef void (ObjType::*ObjTypeFn)();
- PThreadObj(ObjType & _obj, ObjTypeFn _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
+ PThreadObj(ObjType & _obj, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
obj(_obj), fn(_fn)
{ PThread::Resume(); }
- PThreadObj(const char * _file, int _line, ObjType & _obj, ObjTypeFn _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+ PThreadObj(const char * _file, int _line, ObjType & _obj, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)),
obj(_obj), fn(_fn)
{ PThread::Resume(); }
@@ -716,12 +716,12 @@
PCLASSINFO(PThreadObj1Arg, PThread);
public:
typedef void (ObjType::*ObjTypeFn)(Arg1Type);
- PThreadObj1Arg(ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
+ PThreadObj1Arg(ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread),
obj(_obj), fn(_fn), arg1(_arg1)
{ PThread::Resume(); }
- PThreadObj1Arg(const char * _file, int _line, ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL autoDelete = FALSE)
- : PThread(10000, autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
+ PThreadObj1Arg(const char * _file, int _line, ObjType & _obj, Arg1Type _arg1, ObjTypeFn _fn, BOOL _autoDelete = FALSE)
+ : PThread(10000, _autoDelete ? PThread::AutoDeleteThread : PThread::NoAutoDeleteThread, NormalPriority,
psprintf("%s:%08x-%s:%i", GetClass(), (void *)this, _file, _line)),
obj(_obj), fn(_fn), arg1(_arg1)
{ PThread::Resume(); }
Modified: ptlib/trunk/src/ptlib/common/pglobalstatic.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/pglobalstatic.cxx 2007-11-18 11:05:12 UTC (rev 18889)
+++ ptlib/trunk/src/ptlib/common/pglobalstatic.cxx 2007-11-18 20:45:22 UTC (rev 18890)
@@ -105,9 +105,9 @@
#include <ptlib/videoio.h>
#if defined(_WIN32)
- PWLIB_STATIC_LOAD_PLUGIN(Window, PVideoOutputDevice);
#if ! defined(NO_VIDEO_CAPTURE)
#if defined(P_VFW_CAPTURE)
+ PWLIB_STATIC_LOAD_PLUGIN(Window, PVideoOutputDevice);
PWLIB_STATIC_LOAD_PLUGIN(VideoForWindows, PVideoInputDevice);
#endif /*P_VFW_CAPTURE*/
#if defined(P_DIRECTSHOW)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cso...@us...> - 2007-11-18 23:37:07
|
Revision: 18891
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18891&view=rev
Author: csoutheren
Date: 2007-11-18 15:37:11 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
Allow compilation without DirectX SDK
Modified Paths:
--------------
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
ptlib/trunk/src/ptlib/msos/sound_directsound.cxx
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/configure.ac 2007-11-18 23:37:11 UTC (rev 18891)
@@ -2261,6 +2261,7 @@
dnl MSWIN_DISPLAY dsound,Direct Sound Support
dnl MSWIN_CHECK_FILE dsound,include\dsound.h,P_DIRECTSOUND=1
+dnl MSWIN_CHECK_FILE dsound,include\armmacros.s,P_DIRECTSOUND_WINCE=1
dnl MSWIN_DIR_SYMBOL dsound,DIRECTX_DIR
dnl MSWIN_FIND_FILE dsound,P_DIRECTSOUND_LIB64,dsound.lib,lib/x64
dnl MSWIN_FIND_FILE dsound,P_DIRECTSOUND_LIB32,dsound.lib,lib/x86
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/include/ptbuildopts.h.in 2007-11-18 23:37:11 UTC (rev 18891)
@@ -726,6 +726,7 @@
//
// DirectX Support (Windows only)
//
+#undef P_DIRECTSOUND_WINCE
#ifndef _WIN32_WCE
#undef P_DIRECTSOUND
@@ -733,7 +734,7 @@
#undef P_VFW_CAPTURE
#endif
-#if defined(_MSC_VER) && (defined(P_DIRECTSOUND) || defined(P_DIRECTSHOW))
+#if defined(_MSC_VER) && (defined(P_DIRECTSOUND) || defined(P_DIRECTSHOW)) && !defined(P_DIRECTSOUND_WINCE)
#pragma include_alias(<dsound.h>, <@DIRECTX_DIR@/include/dsound.h>)
Modified: ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h 2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h 2007-11-18 23:37:11 UTC (rev 18891)
@@ -43,7 +43,7 @@
#include <ptlib.h>
#include <ptbuildopts.h>
-#ifdef P_DIRECTSOUND
+#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE)
#include <ptlib/sound.h>
Modified: ptlib/trunk/src/ptlib/msos/sound_directsound.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/sound_directsound.cxx 2007-11-18 20:45:22 UTC (rev 18890)
+++ ptlib/trunk/src/ptlib/msos/sound_directsound.cxx 2007-11-18 23:37:11 UTC (rev 18891)
@@ -49,7 +49,7 @@
#include <ptlib.h>
-#ifdef P_DIRECTSOUND
+#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE)
#include <ptlib/msos/ptlib/sound_directsound.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-11-20 23:08:20
|
Revision: 18911
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18911&view=rev
Author: rjongbloed
Date: 2007-11-20 15:08:23 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Added a range to the random number generator to give a better distribution of random numbers across the range rather than the naive approach of just using modulo arithmetic on the 32 bit value.
Modified Paths:
--------------
ptlib/trunk/include/ptclib/random.h
ptlib/trunk/samples/ThreadSafe/main.cxx
ptlib/trunk/samples/dtmftest/main.cxx
ptlib/trunk/src/ptclib/random.cxx
Modified: ptlib/trunk/include/ptclib/random.h
===================================================================
--- ptlib/trunk/include/ptclib/random.h 2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/include/ptclib/random.h 2007-11-20 23:08:23 UTC (rev 18911)
@@ -107,7 +107,7 @@
This generates one pseudorandom unsigned integer (32bit) which is
uniformly distributed among 0 to 2^32-1 for each call.
*/
- unsigned Generate();
+ unsigned Generate(unsigned maximum = UINT_MAX, unsigned minimum = 0);
/**Get the next psuedo-random number in sequence.
*/
Modified: ptlib/trunk/samples/ThreadSafe/main.cxx
===================================================================
--- ptlib/trunk/samples/ThreadSafe/main.cxx 2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/samples/ThreadSafe/main.cxx 2007-11-20 23:08:23 UTC (rev 18911)
@@ -163,8 +163,9 @@
cout << "Starting " << threadCount << " threads." << endl;
+ PRandom random;
for (PINDEX i = 0; i < threadCount; i++) {
- PTimeInterval duration = PRandom::Number()%540000 + 60000;
+ PTimeInterval duration = random.Generate(600000, 60000);
cout << setw(4) << (i + 1) << '=' << duration;
if (i%5 == 4)
cout << '\n';
Modified: ptlib/trunk/samples/dtmftest/main.cxx
===================================================================
--- ptlib/trunk/samples/dtmftest/main.cxx 2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/samples/dtmftest/main.cxx 2007-11-20 23:08:23 UTC (rev 18911)
@@ -146,6 +146,7 @@
cout << "Sample section is " << milliseconds << " ms long.\n";
+ PRandom random;
PShortArray noiseSignal(milliseconds * samplesPerMillisecond);
if (args.HasOption('n')) {
unsigned noise = args.GetOptionString('n').AsUnsigned();
@@ -155,7 +156,7 @@
}
cout << "Peak noise magnitude is " << noise << '\n';
for (i = 0; i < noiseSignal.GetSize(); i++)
- noiseSignal[i] = (short)(PRandom::Number() % noise/2 - noise/2);
+ noiseSignal[i] = (short)((int)random.Generate(noise/2) - noise/2);
}
Modified: ptlib/trunk/src/ptclib/random.cxx
===================================================================
--- ptlib/trunk/src/ptclib/random.cxx 2007-11-20 19:39:03 UTC (rev 18910)
+++ ptlib/trunk/src/ptclib/random.cxx 2007-11-20 23:08:23 UTC (rev 18911)
@@ -140,32 +140,42 @@
*(r++) = b = ind(mm,y>>RandBits) + x; \
}
-unsigned PRandom::Generate()
+
+static unsigned redistribute(unsigned value, unsigned maximum, unsigned minimum)
{
- if (randcnt--)
- return randrsl[randcnt];
+ unsigned range = maximum - minimum;
+ while (value > range)
+ value = (value/range) ^ (value%range);
+ return value + minimum;
+}
- register DWORD a,b,x,y,*m,*mm,*m2,*r,*mend;
- mm=randmem; r=randrsl;
- a = randa; b = randb + (++randc);
- for (m = mm, mend = m2 = m+(RandSize/2); m<mend; )
- {
- rngstep( a<<13, a, b, mm, m, m2, r, x);
- rngstep( a>>6 , a, b, mm, m, m2, r, x);
- rngstep( a<<2 , a, b, mm, m, m2, r, x);
- rngstep( a>>16, a, b, mm, m, m2, r, x);
+
+unsigned PRandom::Generate(unsigned maximum, unsigned minimum)
+{
+ if (randcnt-- == 0) {
+ register DWORD a,b,x,y,*m,*mm,*m2,*r,*mend;
+ mm=randmem; r=randrsl;
+ a = randa; b = randb + (++randc);
+ for (m = mm, mend = m2 = m+(RandSize/2); m<mend; )
+ {
+ rngstep( a<<13, a, b, mm, m, m2, r, x);
+ rngstep( a>>6 , a, b, mm, m, m2, r, x);
+ rngstep( a<<2 , a, b, mm, m, m2, r, x);
+ rngstep( a>>16, a, b, mm, m, m2, r, x);
+ }
+ for (m2 = mm; m2<mend; )
+ {
+ rngstep( a<<13, a, b, mm, m, m2, r, x);
+ rngstep( a>>6 , a, b, mm, m, m2, r, x);
+ rngstep( a<<2 , a, b, mm, m, m2, r, x);
+ rngstep( a>>16, a, b, mm, m, m2, r, x);
+ }
+ randb = b; randa = a;
+
+ randcnt = RandSize-1;
}
- for (m2 = mm; m2<mend; )
- {
- rngstep( a<<13, a, b, mm, m, m2, r, x);
- rngstep( a>>6 , a, b, mm, m, m2, r, x);
- rngstep( a<<2 , a, b, mm, m, m2, r, x);
- rngstep( a>>16, a, b, mm, m, m2, r, x);
- }
- randb = b; randa = a;
- randcnt = RandSize-1;
- return randrsl[randcnt];
+ return redistribute(randrsl[randcnt], maximum, minimum);
}
@@ -186,7 +196,7 @@
unsigned int PRandom::Number(unsigned int min, unsigned int max)
{
- return ((PRandom::Number() % (max - min + 1)) + min);
+ return redistribute(PRandom::Number(), max, min);
}
// End Of File ///////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-11-21 02:24:16
|
Revision: 18912
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18912&view=rev
Author: rjongbloed
Date: 2007-11-20 18:24:20 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
Random number API change to be more consistent, thanks Derek!
Modified Paths:
--------------
ptlib/trunk/include/ptclib/random.h
ptlib/trunk/src/ptclib/random.cxx
Modified: ptlib/trunk/include/ptclib/random.h
===================================================================
--- ptlib/trunk/include/ptclib/random.h 2007-11-20 23:08:23 UTC (rev 18911)
+++ ptlib/trunk/include/ptclib/random.h 2007-11-21 02:24:20 UTC (rev 18912)
@@ -107,10 +107,25 @@
This generates one pseudorandom unsigned integer (32bit) which is
uniformly distributed among 0 to 2^32-1 for each call.
*/
- unsigned Generate(unsigned maximum = UINT_MAX, unsigned minimum = 0);
+ unsigned Generate();
/**Get the next psuedo-random number in sequence.
+ This generates one pseudorandom unsigned integer from 0 to maximum.
+ Uses the Generate() function and scales accordingly.
*/
+ unsigned Generate(unsigned maximum);
+
+ /**Get the next psuedo-random number in sequence.
+ This generates one pseudorandom unsigned integer from minimum to maximum.
+ Uses the Generate() function and scales and shifts accordingly.
+ */
+ unsigned Generate(unsigned minimum, unsigned maximum);
+
+ /**Get the next psuedo-random number in sequence.
+ This generates one pseudorandom unsigned integer which is
+ uniformly distributed among 0 to maximum for each call. Uses
+ Generate()
+ */
inline operator unsigned() { return Generate(); }
@@ -120,10 +135,14 @@
*/
static unsigned Number();
- /** Get a random number between min and max
+ /** Get a random number between zero and maximum
*/
- static unsigned int Number(unsigned int min, unsigned int max);
+ static unsigned Number(unsigned maximum);
+ /** Get a random number between minimum and maximum
+ */
+ static unsigned Number(unsigned minimum, unsigned maximum);
+
protected:
enum {
RandBits = 8, ///< I recommend 8 for crypto, 4 for simulations
Modified: ptlib/trunk/src/ptclib/random.cxx
===================================================================
--- ptlib/trunk/src/ptclib/random.cxx 2007-11-20 23:08:23 UTC (rev 18911)
+++ ptlib/trunk/src/ptclib/random.cxx 2007-11-21 02:24:20 UTC (rev 18912)
@@ -141,7 +141,7 @@
}
-static unsigned redistribute(unsigned value, unsigned maximum, unsigned minimum)
+static unsigned redistribute(unsigned value, unsigned minimum, unsigned maximum)
{
unsigned range = maximum - minimum;
while (value > range)
@@ -150,7 +150,7 @@
}
-unsigned PRandom::Generate(unsigned maximum, unsigned minimum)
+unsigned PRandom::Generate()
{
if (randcnt-- == 0) {
register DWORD a,b,x,y,*m,*mm,*m2,*r,*mend;
@@ -175,10 +175,22 @@
randcnt = RandSize-1;
}
- return redistribute(randrsl[randcnt], maximum, minimum);
+ return randrsl[randcnt];
}
+unsigned PRandom::Generate(unsigned maximum)
+{
+ return redistribute(Generate(), 0, maximum);
+}
+
+
+unsigned PRandom::Generate(unsigned minimum, unsigned maximum)
+{
+ return redistribute(Generate(), minimum, maximum);
+}
+
+
#ifdef P_RTEMS
static PMutex mutex;
#endif
@@ -194,9 +206,16 @@
return rand;
}
-unsigned int PRandom::Number(unsigned int min, unsigned int max)
+unsigned int PRandom::Number(unsigned maximum)
{
- return redistribute(PRandom::Number(), max, min);
+ return redistribute(Number(), 0, maximum);
}
+
+unsigned int PRandom::Number(unsigned minimum, unsigned maximum)
+{
+ return redistribute(Number(), minimum, maximum);
+}
+
+
// End Of File ///////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2007-11-21 22:58:10
|
Revision: 18923
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18923&view=rev
Author: rjongbloed
Date: 2007-11-21 14:58:14 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Renamed old DevStudio 2003 solution files so don't keep selecting them by accident when have 2005 installed.
Added Paths:
-----------
ptlib/trunk/ptlib_2003.sln
ptlib/trunk/ptlib_samples_2003.sln
ptlib/trunk/samples/ODBC/odbctest_2003.sln
ptlib/trunk/tools/asnparser/asnparser_2003.sln
Removed Paths:
-------------
ptlib/trunk/ptlib.sln
ptlib/trunk/ptlib_samples.sln
ptlib/trunk/samples/ODBC/odbctest.sln
ptlib/trunk/tools/asnparser/asnparser.sln
Deleted: ptlib/trunk/ptlib.sln
===================================================================
--- ptlib/trunk/ptlib.sln 2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/ptlib.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,70 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Pseudo-Debug = Pseudo-Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Pseudo-Debug.ActiveCfg = Debug|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.Pseudo-Debug.ActiveCfg = Debug|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Pseudo-Debug.ActiveCfg = Debug|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.Build.0 = Debug|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.ActiveCfg = Debug|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.Build.0 = Debug|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Release.Build.0 = Release|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.ActiveCfg = Debug|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.Build.0 = Debug|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.ActiveCfg = Debug|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.Build.0 = Debug|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
Copied: ptlib/trunk/ptlib_2003.sln (from rev 18922, ptlib/trunk/ptlib.sln)
===================================================================
--- ptlib/trunk/ptlib_2003.sln (rev 0)
+++ ptlib/trunk/ptlib_2003.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,70 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Pseudo-Debug = Pseudo-Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Pseudo-Debug.ActiveCfg = Debug|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.Pseudo-Debug.ActiveCfg = Debug|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Pseudo-Debug.ActiveCfg = Debug|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.Build.0 = Debug|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.ActiveCfg = Debug|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Pseudo-Debug.Build.0 = Debug|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Release.Build.0 = Release|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.ActiveCfg = Debug|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Pseudo-Debug.Build.0 = Debug|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.ActiveCfg = Debug|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Pseudo-Debug.Build.0 = Debug|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Deleted: ptlib/trunk/ptlib_samples.sln
===================================================================
--- ptlib/trunk/ptlib_samples.sln 2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/ptlib_samples.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,308 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World Static", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "samples\xmlrpc\xmlrpc.vcproj", "{435616F1-7BA5-4DF5-9108-879BE511F5A1}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stunclient", "samples\stunclient\stunclient.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpptest", "samples\xmpptest\xmpptest.vcproj", "{D2A0F886-B231-4CD6-A959-3FB1626C1662}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timing", "samples\timing\timing.vcproj", "{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vxmltest", "samples\vxmltest\vxmltest.vcproj", "{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadSafe", "samples\ThreadSafe\ThreadSafe.vcproj", "{7AB210A3-FB94-473A-93A5-7CEE149B136C}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipv6test", "samples\ipv6test\ipv6test.vcproj", "{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnstest", "samples\dnstest\dnstest.vcproj", "{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emailtest", "samples\emailtest\emailtest.vcproj", "{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vidtest", "samples\vidtest\vidtest.vcproj", "{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aggtest", "samples\aggtest\aggtest.vcproj", "{0BF651AA-894B-49F3-9B60-24BFFBFC004C}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmftest", "samples\dtmftest\dtmftest.vcproj", "{F057363D-AFD2-4DC4-9C44-57B714C27162}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "factory", "samples\factory\factory.vcproj", "{2C44F783-CA2A-44A5-A463-CC7956BE00A7}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "find_ip", "samples\find_ip\find_ip.vcproj", "{46D2EA84-33A6-4249-B9ED-779065478CA6}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ldaptest", "samples\ldaptest\ldaptest.vcproj", "{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptimer", "samples\ptimer\ptimer.vcproj", "{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PxmlTest", "samples\pxml\PxmlTest.vcproj", "{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "safetest", "samples\safetest\safetest.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SortedListTest", "samples\sortedlist\SortedListTest.vcproj", "{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadex", "samples\threadex\threadex.vcproj", "{89F7154A-47E5-47FE-88E3-E5E8EC516752}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wavfile", "samples\wavfile\wavfile.vcproj", "{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpcsrvr", "samples\xmlrpcsrvr\xmlrpcsrvr.vcproj", "{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World DLL", "samples\hello_world\helloDLL_2003.vcproj", "{3B071642-5CE4-4B49-AFE8-8D475DF14F49}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockbundle", "samples\sockbundle\sockbundle_2003.vcproj", "{3F866477-F1AA-4EB8-A399-B7971CF49747}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- No Trace = No Trace
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.ActiveCfg = No Trace|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.Build.0 = No Trace|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
- {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.ActiveCfg = No Trace|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.Build.0 = No Trace|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
- {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.ActiveCfg = No Trace|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.Build.0 = No Trace|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
- {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.No Trace.ActiveCfg = No Trace|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
- {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.No Trace.ActiveCfg = No Trace|Win32
- {9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.ActiveCfg = No Trace|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.Build.0 = No Trace|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
- {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
- {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.ActiveCfg = Debug|Win32
- {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.Build.0 = Debug|Win32
- {435616F1-7BA5-4DF5-9108-879BE511F5A1}.No Trace.ActiveCfg = No Trace|Win32
- {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.ActiveCfg = Release|Win32
- {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.Build.0 = Release|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
- {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.ActiveCfg = Debug|Win32
- {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.Build.0 = Debug|Win32
- {D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.ActiveCfg = No Trace|Win32
- {D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.Build.0 = No Trace|Win32
- {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.ActiveCfg = Release|Win32
- {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.Build.0 = Release|Win32
- {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.ActiveCfg = Debug|Win32
- {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.Build.0 = Debug|Win32
- {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.ActiveCfg = No Trace|Win32
- {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.Build.0 = No Trace|Win32
- {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.ActiveCfg = Release|Win32
- {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.Build.0 = Release|Win32
- {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.ActiveCfg = Debug|Win32
- {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.Build.0 = Debug|Win32
- {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.ActiveCfg = No Trace|Win32
- {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.Build.0 = No Trace|Win32
- {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.ActiveCfg = Release|Win32
- {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.Build.0 = Release|Win32
- {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.ActiveCfg = Debug|Win32
- {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.Build.0 = Debug|Win32
- {7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.ActiveCfg = No Trace|Win32
- {7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.Build.0 = No Trace|Win32
- {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.ActiveCfg = Release|Win32
- {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.Build.0 = Release|Win32
- {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.ActiveCfg = Debug|Win32
- {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.Build.0 = Debug|Win32
- {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.ActiveCfg = No Trace|Win32
- {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.Build.0 = No Trace|Win32
- {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.ActiveCfg = Release|Win32
- {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.Build.0 = Release|Win32
- {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.ActiveCfg = Debug|Win32
- {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.Build.0 = Debug|Win32
- {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.ActiveCfg = No Trace|Win32
- {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.Build.0 = No Trace|Win32
- {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.ActiveCfg = Release|Win32
- {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.Build.0 = Release|Win32
- {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.ActiveCfg = Debug|Win32
- {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.Build.0 = Debug|Win32
- {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.ActiveCfg = No Trace|Win32
- {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.Build.0 = No Trace|Win32
- {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.ActiveCfg = Release|Win32
- {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.Build.0 = Release|Win32
- {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.ActiveCfg = Debug|Win32
- {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.Build.0 = Debug|Win32
- {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.ActiveCfg = No Trace|Win32
- {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.Build.0 = No Trace|Win32
- {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.ActiveCfg = Release|Win32
- {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.Build.0 = Release|Win32
- {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.ActiveCfg = Debug|Win32
- {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.Build.0 = Debug|Win32
- {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.ActiveCfg = No Trace|Win32
- {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.Build.0 = No Trace|Win32
- {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.ActiveCfg = Release|Win32
- {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.Build.0 = Release|Win32
- {F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.ActiveCfg = Debug|Win32
- {F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.Build.0 = Debug|Win32
- {F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.ActiveCfg = No Trace|Win32
- {F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.Build.0 = No Trace|Win32
- {F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.ActiveCfg = Release|Win32
- {F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.Build.0 = Release|Win32
- {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.ActiveCfg = Debug|Win32
- {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.Build.0 = Debug|Win32
- {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.ActiveCfg = No Trace|Win32
- {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.Build.0 = No Trace|Win32
- {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.ActiveCfg = Release|Win32
- {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.Build.0 = Release|Win32
- {46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.ActiveCfg = Debug|Win32
- {46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.Build.0 = Debug|Win32
- {46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.ActiveCfg = No Trace|Win32
- {46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.Build.0 = No Trace|Win32
- {46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.ActiveCfg = Release|Win32
- {46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.Build.0 = Release|Win32
- {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.ActiveCfg = Debug|Win32
- {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.Build.0 = Debug|Win32
- {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.ActiveCfg = No Trace|Win32
- {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.Build.0 = No Trace|Win32
- {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.ActiveCfg = Release|Win32
- {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.Build.0 = Release|Win32
- {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.ActiveCfg = Debug|Win32
- {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.Build.0 = Debug|Win32
- {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.ActiveCfg = No Trace|Win32
- {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.Build.0 = No Trace|Win32
- {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.ActiveCfg = Release|Win32
- {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.Build.0 = Release|Win32
- {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.ActiveCfg = Debug|Win32
- {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.Build.0 = Debug|Win32
- {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.ActiveCfg = No Trace|Win32
- {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.Build.0 = No Trace|Win32
- {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.ActiveCfg = Release|Win32
- {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.Build.0 = Release|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
- {D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
- {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.ActiveCfg = Debug|Win32
- {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.Build.0 = Debug|Win32
- {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.ActiveCfg = No Trace|Win32
- {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.Build.0 = No Trace|Win32
- {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.ActiveCfg = Release|Win32
- {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.Build.0 = Release|Win32
- {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.ActiveCfg = Debug|Win32
- {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.Build.0 = Debug|Win32
- {89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.ActiveCfg = No Trace|Win32
- {89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.Build.0 = No Trace|Win32
- {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.ActiveCfg = Release|Win32
- {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.Build.0 = Release|Win32
- {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.ActiveCfg = Debug|Win32
- {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.Build.0 = Debug|Win32
- {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.ActiveCfg = No Trace|Win32
- {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.Build.0 = No Trace|Win32
- {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.ActiveCfg = Release|Win32
- {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.Build.0 = Release|Win32
- {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.ActiveCfg = Debug|Win32
- {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.Build.0 = Debug|Win32
- {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.ActiveCfg = No Trace|Win32
- {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.Build.0 = No Trace|Win32
- {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.ActiveCfg = Release|Win32
- {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.Build.0 = Release|Win32
- {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.ActiveCfg = Debug|Win32
- {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.Build.0 = Debug|Win32
- {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.ActiveCfg = No Trace|Win32
- {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.Build.0 = No Trace|Win32
- {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.ActiveCfg = Release|Win32
- {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.Build.0 = Release|Win32
- {3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.ActiveCfg = Debug|Win32
- {3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.Build.0 = Debug|Win32
- {3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.ActiveCfg = No Trace|Win32
- {3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.Build.0 = No Trace|Win32
- {3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.ActiveCfg = Release|Win32
- {3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
Copied: ptlib/trunk/ptlib_samples_2003.sln (from rev 18922, ptlib/trunk/ptlib_samples.sln)
===================================================================
--- ptlib/trunk/ptlib_samples_2003.sln (rev 0)
+++ ptlib/trunk/ptlib_samples_2003.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,308 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World Static", "samples\hello_world\hello.vcproj", "{D38CA533-D522-4D9E-B2C9-D59F6C415268}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib Static", "src\ptlib\msos\Console.vcproj", "{E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTLib DLL", "src\ptlib\msos\PTLib.vcproj", "{85F4F26A-1A5D-4685-A48A-448102C5C5BC}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeSym", "tools\MergeSym\MergeSym.vcproj", "{F34BE504-015A-42E6-9342-3800EAD5F561}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "configure", "tools\configure\configure.vcproj", "{9C8D0100-6709-4628-9993-69F443AF69E8}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paec", "src\ptclib\speex_echo\PAEC.vcproj", "{6316EB4E-0F57-4491-9383-22072AF3D996}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpc", "samples\xmlrpc\xmlrpc.vcproj", "{435616F1-7BA5-4DF5-9108-879BE511F5A1}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stunclient", "samples\stunclient\stunclient.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpptest", "samples\xmpptest\xmpptest.vcproj", "{D2A0F886-B231-4CD6-A959-3FB1626C1662}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timing", "samples\timing\timing.vcproj", "{6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vxmltest", "samples\vxmltest\vxmltest.vcproj", "{7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadSafe", "samples\ThreadSafe\ThreadSafe.vcproj", "{7AB210A3-FB94-473A-93A5-7CEE149B136C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipv6test", "samples\ipv6test\ipv6test.vcproj", "{65B235B6-1DE9-478B-AD81-66BE3F9F3A66}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnstest", "samples\dnstest\dnstest.vcproj", "{5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emailtest", "samples\emailtest\emailtest.vcproj", "{F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vidtest", "samples\vidtest\vidtest.vcproj", "{4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aggtest", "samples\aggtest\aggtest.vcproj", "{0BF651AA-894B-49F3-9B60-24BFFBFC004C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dtmftest", "samples\dtmftest\dtmftest.vcproj", "{F057363D-AFD2-4DC4-9C44-57B714C27162}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "factory", "samples\factory\factory.vcproj", "{2C44F783-CA2A-44A5-A463-CC7956BE00A7}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "find_ip", "samples\find_ip\find_ip.vcproj", "{46D2EA84-33A6-4249-B9ED-779065478CA6}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ldaptest", "samples\ldaptest\ldaptest.vcproj", "{B4C909FB-E827-4A5C-AB87-EA61ED5E7377}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ptimer", "samples\ptimer\ptimer.vcproj", "{6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PxmlTest", "samples\pxml\PxmlTest.vcproj", "{87F30420-DEB2-47FA-99AE-5C7C5F2A428C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "safetest", "samples\safetest\safetest.vcproj", "{D0C00ADD-544B-4922-AB52-14415894D684}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SortedListTest", "samples\sortedlist\SortedListTest.vcproj", "{87578277-AE7F-4B03-A8F8-EBB301EB4EC8}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadex", "samples\threadex\threadex.vcproj", "{89F7154A-47E5-47FE-88E3-E5E8EC516752}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wavfile", "samples\wavfile\wavfile.vcproj", "{042020F3-F4F1-4C93-A7FA-DE67E1B3212D}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlrpcsrvr", "samples\xmlrpcsrvr\xmlrpcsrvr.vcproj", "{9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Hello World DLL", "samples\hello_world\helloDLL_2003.vcproj", "{3B071642-5CE4-4B49-AFE8-8D475DF14F49}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockbundle", "samples\sockbundle\sockbundle_2003.vcproj", "{3F866477-F1AA-4EB8-A399-B7971CF49747}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ No Trace = No Trace
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.ActiveCfg = Debug|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Debug.Build.0 = Debug|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.ActiveCfg = No Trace|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.No Trace.Build.0 = No Trace|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.ActiveCfg = Release|Win32
+ {D38CA533-D522-4D9E-B2C9-D59F6C415268}.Release.Build.0 = Release|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.ActiveCfg = Debug|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Debug.Build.0 = Debug|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.ActiveCfg = No Trace|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.No Trace.Build.0 = No Trace|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.ActiveCfg = Release|Win32
+ {E61B4DFB-0CAB-46DD-BB02-1AFFD61DB7F5}.Release.Build.0 = Release|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.ActiveCfg = Debug|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Debug.Build.0 = Debug|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.ActiveCfg = No Trace|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.No Trace.Build.0 = No Trace|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.ActiveCfg = Release|Win32
+ {85F4F26A-1A5D-4685-A48A-448102C5C5BC}.Release.Build.0 = Release|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.Debug.ActiveCfg = Debug|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.No Trace.ActiveCfg = No Trace|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.ActiveCfg = Release|Win32
+ {F34BE504-015A-42E6-9342-3800EAD5F561}.Release.Build.0 = Release|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Debug.ActiveCfg = Debug|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.No Trace.ActiveCfg = No Trace|Win32
+ {9C8D0100-6709-4628-9993-69F443AF69E8}.Release.ActiveCfg = Release|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.ActiveCfg = Debug|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Debug.Build.0 = Debug|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.ActiveCfg = No Trace|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.No Trace.Build.0 = No Trace|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.ActiveCfg = Release|Win32
+ {6316EB4E-0F57-4491-9383-22072AF3D996}.Release.Build.0 = Release|Win32
+ {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.ActiveCfg = Debug|Win32
+ {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Debug.Build.0 = Debug|Win32
+ {435616F1-7BA5-4DF5-9108-879BE511F5A1}.No Trace.ActiveCfg = No Trace|Win32
+ {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.ActiveCfg = Release|Win32
+ {435616F1-7BA5-4DF5-9108-879BE511F5A1}.Release.Build.0 = Release|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
+ {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.ActiveCfg = Debug|Win32
+ {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Debug.Build.0 = Debug|Win32
+ {D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.ActiveCfg = No Trace|Win32
+ {D2A0F886-B231-4CD6-A959-3FB1626C1662}.No Trace.Build.0 = No Trace|Win32
+ {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.ActiveCfg = Release|Win32
+ {D2A0F886-B231-4CD6-A959-3FB1626C1662}.Release.Build.0 = Release|Win32
+ {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.ActiveCfg = Debug|Win32
+ {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Debug.Build.0 = Debug|Win32
+ {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.ActiveCfg = No Trace|Win32
+ {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.No Trace.Build.0 = No Trace|Win32
+ {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.ActiveCfg = Release|Win32
+ {6766F4B9-E8F3-4BA9-8ECF-46361BD1CB97}.Release.Build.0 = Release|Win32
+ {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.ActiveCfg = Debug|Win32
+ {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Debug.Build.0 = Debug|Win32
+ {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.ActiveCfg = No Trace|Win32
+ {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.No Trace.Build.0 = No Trace|Win32
+ {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.ActiveCfg = Release|Win32
+ {7E636B64-DA9D-4711-9F5D-4E1C2EFA8DB2}.Release.Build.0 = Release|Win32
+ {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.ActiveCfg = Debug|Win32
+ {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Debug.Build.0 = Debug|Win32
+ {7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.ActiveCfg = No Trace|Win32
+ {7AB210A3-FB94-473A-93A5-7CEE149B136C}.No Trace.Build.0 = No Trace|Win32
+ {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.ActiveCfg = Release|Win32
+ {7AB210A3-FB94-473A-93A5-7CEE149B136C}.Release.Build.0 = Release|Win32
+ {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.ActiveCfg = Debug|Win32
+ {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Debug.Build.0 = Debug|Win32
+ {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.ActiveCfg = No Trace|Win32
+ {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.No Trace.Build.0 = No Trace|Win32
+ {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.ActiveCfg = Release|Win32
+ {65B235B6-1DE9-478B-AD81-66BE3F9F3A66}.Release.Build.0 = Release|Win32
+ {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.ActiveCfg = Debug|Win32
+ {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Debug.Build.0 = Debug|Win32
+ {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.ActiveCfg = No Trace|Win32
+ {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.No Trace.Build.0 = No Trace|Win32
+ {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.ActiveCfg = Release|Win32
+ {5EA556B2-5A78-46D7-98A2-B0E3498ABCD1}.Release.Build.0 = Release|Win32
+ {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.ActiveCfg = Debug|Win32
+ {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Debug.Build.0 = Debug|Win32
+ {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.ActiveCfg = No Trace|Win32
+ {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.No Trace.Build.0 = No Trace|Win32
+ {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.ActiveCfg = Release|Win32
+ {F9A6DEF5-0329-4651-B05C-A3FAE105CA4E}.Release.Build.0 = Release|Win32
+ {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.ActiveCfg = Debug|Win32
+ {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Debug.Build.0 = Debug|Win32
+ {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.ActiveCfg = No Trace|Win32
+ {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.No Trace.Build.0 = No Trace|Win32
+ {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.ActiveCfg = Release|Win32
+ {4F412B34-84BD-4FF9-B64D-81D7A5BBA99B}.Release.Build.0 = Release|Win32
+ {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.ActiveCfg = Debug|Win32
+ {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Debug.Build.0 = Debug|Win32
+ {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.ActiveCfg = No Trace|Win32
+ {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.No Trace.Build.0 = No Trace|Win32
+ {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.ActiveCfg = Release|Win32
+ {0BF651AA-894B-49F3-9B60-24BFFBFC004C}.Release.Build.0 = Release|Win32
+ {F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.ActiveCfg = Debug|Win32
+ {F057363D-AFD2-4DC4-9C44-57B714C27162}.Debug.Build.0 = Debug|Win32
+ {F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.ActiveCfg = No Trace|Win32
+ {F057363D-AFD2-4DC4-9C44-57B714C27162}.No Trace.Build.0 = No Trace|Win32
+ {F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.ActiveCfg = Release|Win32
+ {F057363D-AFD2-4DC4-9C44-57B714C27162}.Release.Build.0 = Release|Win32
+ {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.ActiveCfg = Debug|Win32
+ {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Debug.Build.0 = Debug|Win32
+ {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.ActiveCfg = No Trace|Win32
+ {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.No Trace.Build.0 = No Trace|Win32
+ {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.ActiveCfg = Release|Win32
+ {2C44F783-CA2A-44A5-A463-CC7956BE00A7}.Release.Build.0 = Release|Win32
+ {46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.ActiveCfg = Debug|Win32
+ {46D2EA84-33A6-4249-B9ED-779065478CA6}.Debug.Build.0 = Debug|Win32
+ {46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.ActiveCfg = No Trace|Win32
+ {46D2EA84-33A6-4249-B9ED-779065478CA6}.No Trace.Build.0 = No Trace|Win32
+ {46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.ActiveCfg = Release|Win32
+ {46D2EA84-33A6-4249-B9ED-779065478CA6}.Release.Build.0 = Release|Win32
+ {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.ActiveCfg = Debug|Win32
+ {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Debug.Build.0 = Debug|Win32
+ {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.ActiveCfg = No Trace|Win32
+ {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.No Trace.Build.0 = No Trace|Win32
+ {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.ActiveCfg = Release|Win32
+ {B4C909FB-E827-4A5C-AB87-EA61ED5E7377}.Release.Build.0 = Release|Win32
+ {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.ActiveCfg = Debug|Win32
+ {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Debug.Build.0 = Debug|Win32
+ {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.ActiveCfg = No Trace|Win32
+ {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.No Trace.Build.0 = No Trace|Win32
+ {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.ActiveCfg = Release|Win32
+ {6D43C36C-3903-4A90-A3A6-9AC3E79E3B28}.Release.Build.0 = Release|Win32
+ {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.ActiveCfg = Debug|Win32
+ {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Debug.Build.0 = Debug|Win32
+ {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.ActiveCfg = No Trace|Win32
+ {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.No Trace.Build.0 = No Trace|Win32
+ {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.ActiveCfg = Release|Win32
+ {87F30420-DEB2-47FA-99AE-5C7C5F2A428C}.Release.Build.0 = Release|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.ActiveCfg = Debug|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Debug.Build.0 = Debug|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.ActiveCfg = No Trace|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.No Trace.Build.0 = No Trace|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Release.ActiveCfg = Release|Win32
+ {D0C00ADD-544B-4922-AB52-14415894D684}.Release.Build.0 = Release|Win32
+ {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.ActiveCfg = Debug|Win32
+ {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Debug.Build.0 = Debug|Win32
+ {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.ActiveCfg = No Trace|Win32
+ {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.No Trace.Build.0 = No Trace|Win32
+ {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.ActiveCfg = Release|Win32
+ {87578277-AE7F-4B03-A8F8-EBB301EB4EC8}.Release.Build.0 = Release|Win32
+ {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.ActiveCfg = Debug|Win32
+ {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Debug.Build.0 = Debug|Win32
+ {89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.ActiveCfg = No Trace|Win32
+ {89F7154A-47E5-47FE-88E3-E5E8EC516752}.No Trace.Build.0 = No Trace|Win32
+ {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.ActiveCfg = Release|Win32
+ {89F7154A-47E5-47FE-88E3-E5E8EC516752}.Release.Build.0 = Release|Win32
+ {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.ActiveCfg = Debug|Win32
+ {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Debug.Build.0 = Debug|Win32
+ {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.ActiveCfg = No Trace|Win32
+ {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.No Trace.Build.0 = No Trace|Win32
+ {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.ActiveCfg = Release|Win32
+ {042020F3-F4F1-4C93-A7FA-DE67E1B3212D}.Release.Build.0 = Release|Win32
+ {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.ActiveCfg = Debug|Win32
+ {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Debug.Build.0 = Debug|Win32
+ {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.ActiveCfg = No Trace|Win32
+ {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.No Trace.Build.0 = No Trace|Win32
+ {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.ActiveCfg = Release|Win32
+ {9F59C0C0-B7C0-4FFA-8AA6-AE41A135A1F3}.Release.Build.0 = Release|Win32
+ {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.ActiveCfg = Debug|Win32
+ {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Debug.Build.0 = Debug|Win32
+ {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.ActiveCfg = No Trace|Win32
+ {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.No Trace.Build.0 = No Trace|Win32
+ {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.ActiveCfg = Release|Win32
+ {3B071642-5CE4-4B49-AFE8-8D475DF14F49}.Release.Build.0 = Release|Win32
+ {3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.ActiveCfg = Debug|Win32
+ {3F866477-F1AA-4EB8-A399-B7971CF49747}.Debug.Build.0 = Debug|Win32
+ {3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.ActiveCfg = No Trace|Win32
+ {3F866477-F1AA-4EB8-A399-B7971CF49747}.No Trace.Build.0 = No Trace|Win32
+ {3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.ActiveCfg = Release|Win32
+ {3F866477-F1AA-4EB8-A399-B7971CF49747}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Deleted: ptlib/trunk/samples/ODBC/odbctest.sln
===================================================================
--- ptlib/trunk/samples/ODBC/odbctest.sln 2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/samples/ODBC/odbctest.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbctest", "odbctest.vcproj", "{2F2988EA-3584-4733-BC1A-58732C0BC917}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.ActiveCfg = Debug|Win32
- {2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.Build.0 = Debug|Win32
- {2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.ActiveCfg = Release|Win32
- {2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
Copied: ptlib/trunk/samples/ODBC/odbctest_2003.sln (from rev 18922, ptlib/trunk/samples/ODBC/odbctest.sln)
===================================================================
--- ptlib/trunk/samples/ODBC/odbctest_2003.sln (rev 0)
+++ ptlib/trunk/samples/ODBC/odbctest_2003.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbctest", "odbctest.vcproj", "{2F2988EA-3584-4733-BC1A-58732C0BC917}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.ActiveCfg = Debug|Win32
+ {2F2988EA-3584-4733-BC1A-58732C0BC917}.Debug.Build.0 = Debug|Win32
+ {2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.ActiveCfg = Release|Win32
+ {2F2988EA-3584-4733-BC1A-58732C0BC917}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Deleted: ptlib/trunk/tools/asnparser/asnparser.sln
===================================================================
--- ptlib/trunk/tools/asnparser/asnparser.sln 2007-11-21 22:46:57 UTC (rev 18922)
+++ ptlib/trunk/tools/asnparser/asnparser.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASNParser", "asnparser.vcproj", "{7D4C9E74-F196-4A30-859F-62748657B86B}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.ActiveCfg = Debug|Win32
- {7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.Build.0 = Debug|Win32
- {7D4C9E74-F196-4A30-859F-62748657B86B}.Release.ActiveCfg = Release|Win32
- {7D4C9E74-F196-4A30-859F-62748657B86B}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
Copied: ptlib/trunk/tools/asnparser/asnparser_2003.sln (from rev 18922, ptlib/trunk/tools/asnparser/asnparser.sln)
===================================================================
--- ptlib/trunk/tools/asnparser/asnparser_2003.sln (rev 0)
+++ ptlib/trunk/tools/asnparser/asnparser_2003.sln 2007-11-21 22:58:14 UTC (rev 18923)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASNParser", "asnparser.vcproj", "{7D4C9E74-F196-4A30-859F-62748657B86B}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.ActiveCfg = Debug|Win32
+ {7D4C9E74-F196-4A30-859F-62748657B86B}.Debug.Build.0 = Debug|Win32
+ {7D4C9E74-F196-4A30-859F-62748657B86B}.Release.ActiveCfg = Release|Win32
+ {7D4C9E74-F196-4A30-859F-62748657B86B}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hfr...@us...> - 2007-11-24 09:55:11
|
Revision: 18939
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18939&view=rev
Author: hfriederich
Date: 2007-11-24 01:55:14 -0800 (Sat, 24 Nov 2007)
Log Message:
-----------
Fix problems with weird c++ class casts within constructors.
Change interface update callback sequence to do all interface
changes on one interface monitor client before changing the
next one.
Add new method for comparing interfaces.
Modified Paths:
--------------
ptlib/trunk/include/ptclib/psockbun.h
ptlib/trunk/src/ptclib/psockbun.cxx
Modified: ptlib/trunk/include/ptclib/psockbun.h
===================================================================
--- ptlib/trunk/include/ptclib/psockbun.h 2007-11-24 04:33:26 UTC (rev 18938)
+++ ptlib/trunk/include/ptclib/psockbun.h 2007-11-24 09:55:14 UTC (rev 18939)
@@ -111,6 +111,15 @@
InterfaceEntry & info /// Information on the interface
);
+ /** Returns whether the descriptor string equals the interface entry.
+ Note that when searching the descriptor may be a partial match
+ e.g. "10.0.1.11" or "%eth0" may be used.
+ */
+ static BOOL IsMatchingInterface(
+ const PString & iface, /// Interface descriptor
+ const InterfaceEntry & entry /// Interface entry
+ );
+
/** Sets the monitor's interface filter. Note that the monitor instance
handles deletion of the filter.
*/
@@ -125,11 +134,9 @@
void AddClient(PInterfaceMonitorClient *);
void RemoveClient(PInterfaceMonitorClient *);
+
+ virtual void OnInterfacesChanged(const PIPSocket::InterfaceTable & addedInterfaces, const PIPSocket::InterfaceTable & removedInterfaces);
- virtual void OnAddInterface(const InterfaceEntry & entry);
- virtual void OnRemoveInterface(const InterfaceEntry & entry);
-
-
typedef PSmartPtr<PInterfaceMonitorClient> ClientPtr;
typedef std::list<PInterfaceMonitorClient *> ClientList_T;
@@ -159,7 +166,10 @@
{
PCLASSINFO(PInterfaceMonitorClient, PSafeObject);
public:
- PInterfaceMonitorClient();
+ enum {
+ DefaultPriority = 50,
+ };
+ PInterfaceMonitorClient(PINDEX priority = DefaultPriority);
~PInterfaceMonitorClient();
typedef PIPSocket::InterfaceEntry InterfaceEntry;
@@ -188,7 +198,7 @@
Higher priority clients get their callback functions called first. Clients
with the same priority get called in the order of their insertion.
*/
- virtual PINDEX GetPriority() const { return 50; }
+ PINDEX GetPriority() const { return priority; }
protected:
/// Call back function for when an interface has been added to the system
@@ -199,6 +209,8 @@
/// Called when a PSTUNClient is about to be destroyed
virtual void OnRemoveSTUNClient(const PSTUNClient * /*stun*/) { }
+
+ PINDEX priority;
friend class PInterfaceMonitor;
};
Modified: ptlib/trunk/src/ptclib/psockbun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/psockbun.cxx 2007-11-24 04:33:26 UTC (rev 18938)
+++ ptlib/trunk/src/ptclib/psockbun.cxx 2007-11-24 09:55:14 UTC (rev 18939)
@@ -44,7 +44,8 @@
//////////////////////////////////////////////////
-PInterfaceMonitorClient::PInterfaceMonitorClient()
+PInterfaceMonitorClient::PInterfaceMonitorClient(PINDEX _priority)
+: priority(_priority)
{
PInterfaceMonitor::GetInstance().AddClient(this);
}
@@ -199,23 +200,30 @@
PIPSocket::InterfaceTable oldInterfaces = currentInterfaces;
currentInterfaces = newInterfaces;
-
+
PTRACE(4, "IfaceMon\tInterface change detected, new list:\n" << setfill('\n') << currentInterfaces << setfill(' '));
-
+
+ // calculate the set of interfaces to add / remove beforehand
+ PIPSocket::InterfaceTable interfacesToAdd;
+ PIPSocket::InterfaceTable interfacesToRemove;
+ interfacesToAdd.DisallowDeleteObjects();
+ interfacesToRemove.DisallowDeleteObjects();
+
+ PINDEX i;
// look for interfaces to add that are in new list that are not in the old list
- PINDEX i;
for (i = 0; i < newInterfaces.GetSize(); ++i) {
PIPSocket::InterfaceEntry & newEntry = newInterfaces[i];
if (!newEntry.GetAddress().IsLoopback() && !IsInterfaceInList(newEntry, oldInterfaces))
- OnAddInterface(newEntry);
+ interfacesToAdd.Append(&newEntry);
}
-
// look for interfaces to remove that are in old list that are not in the new list
for (i = 0; i < oldInterfaces.GetSize(); ++i) {
PIPSocket::InterfaceEntry & oldEntry = oldInterfaces[i];
if (!oldEntry.GetAddress().IsLoopback() && !IsInterfaceInList(oldEntry, newInterfaces))
- OnRemoveInterface(oldEntry);
+ interfacesToRemove.Append(&oldEntry);
}
+
+ OnInterfacesChanged(interfacesToAdd, interfacesToRemove);
}
}
@@ -268,6 +276,18 @@
}
+static BOOL InterfaceMatches(const PIPSocket::Address & addr,
+ const PString & name,
+ const PIPSocket::InterfaceEntry & entry)
+{
+ if ((addr.IsAny() || entry.GetAddress() == addr) &&
+ (name.IsEmpty() || entry.GetName().NumCompare(name) == PString::EqualTo)) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+
PStringArray PInterfaceMonitor::GetInterfaces(BOOL includeLoopBack,
const PIPSocket::Address & destination)
{
@@ -325,8 +345,7 @@
for (PINDEX i = 0; i < currentInterfaces.GetSize(); ++i) {
PIPSocket::InterfaceEntry & entry = currentInterfaces[i];
- if ((addr.IsAny() || entry.GetAddress() == addr) &&
- (name.IsEmpty() || entry.GetName().NumCompare(name) == EqualTo)) {
+ if (InterfaceMatches(addr, name, entry)) {
info = entry;
return TRUE;
}
@@ -336,6 +355,18 @@
}
+BOOL PInterfaceMonitor::IsMatchingInterface(const PString & iface,
+ const PIPSocket::InterfaceEntry & entry)
+{
+ PIPSocket::Address addr;
+ PString name;
+ if (!SplitInterfaceDescription(iface, addr, name))
+ return FALSE;
+
+ return InterfaceMatches(addr, name, entry);
+}
+
+
void PInterfaceMonitor::SetInterfaceFilter(PInterfaceFilter * filter)
{
PWaitAndSignal m(mutex);
@@ -374,35 +405,26 @@
Stop();
}
-
-void PInterfaceMonitor::OnAddInterface(const PIPSocket::InterfaceEntry & entry)
+void PInterfaceMonitor::OnInterfacesChanged(const PIPSocket::InterfaceTable & addedInterfaces,
+ const PIPSocket::InterfaceTable & removedInterfaces)
{
PWaitAndSignal m(mutex);
-
+
for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
PInterfaceMonitorClient * client = *iter;
if (client->LockReadWrite()) {
- client->OnAddInterface(entry);
+ for (PINDEX i = 0; i < addedInterfaces.GetSize(); i++) {
+ client->OnAddInterface(addedInterfaces[i]);
+ }
+ for (PINDEX i = 0; i < removedInterfaces.GetSize(); i++) {
+ client->OnRemoveInterface(removedInterfaces[i]);
+ }
client->UnlockReadWrite();
}
}
}
-void PInterfaceMonitor::OnRemoveInterface(const PIPSocket::InterfaceEntry & entry)
-{
- PWaitAndSignal m(mutex);
-
- for (ClientList_T::reverse_iterator iter = currentClients.rbegin(); iter != currentClients.rend(); ++iter) {
- PInterfaceMonitorClient * client = *iter;
- if (client->LockReadWrite()) {
- client->OnRemoveInterface(entry);
- client->UnlockReadWrite();
- }
- }
-}
-
-
void PInterfaceMonitor::OnRemoveSTUNClient(const PSTUNClient *stun)
{
PWaitAndSignal m(mutex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cso...@us...> - 2007-11-26 13:27:04
|
Revision: 18957
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18957&view=rev
Author: csoutheren
Date: 2007-11-26 05:27:08 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
Ensure VXML scripts end properly
Modified Paths:
--------------
ptlib/trunk/include/ptclib/vxml.h
ptlib/trunk/src/ptclib/vxml.cxx
Modified: ptlib/trunk/include/ptclib/vxml.h
===================================================================
--- ptlib/trunk/include/ptclib/vxml.h 2007-11-26 11:26:28 UTC (rev 18956)
+++ ptlib/trunk/include/ptclib/vxml.h 2007-11-26 13:27:08 UTC (rev 18957)
@@ -166,9 +166,6 @@
PVXMLSession(PTextToSpeech * tts = NULL, BOOL autoDelete = FALSE);
virtual ~PVXMLSession();
- void SetFinishWhenEmpty(BOOL v)
- { finishWhenEmpty = v; }
-
// new functions
PTextToSpeech * SetTextToSpeech(PTextToSpeech * _tts, BOOL autoDelete = FALSE);
PTextToSpeech * SetTextToSpeech(const PString & ttsName);
@@ -212,6 +209,8 @@
virtual BOOL PlaySilence(PINDEX msecs = 0);
virtual BOOL PlaySilence(const PTimeInterval & timeout);
+ virtual BOOL PlayStop();
+
virtual void SetPause(BOOL pause);
virtual void GetBeepData(PBYTEArray & data, unsigned ms);
@@ -302,8 +301,6 @@
PSyncPoint recordSync;
BOOL loaded;
- BOOL finishWhenEmpty;
- BOOL allowFinish;
PURL rootURL;
BOOL emptyAction;
@@ -429,6 +426,16 @@
//////////////////////////////////////////////////////////////////
+class PVXMLPlayableStop : public PVXMLPlayable
+{
+ PCLASSINFO(PVXMLPlayableStop, PVXMLPlayable);
+ public:
+ virtual void Play(PVXMLChannel & outgoingChannel);
+ virtual BOOL ReadFrame(PVXMLChannel & channel, void *, PINDEX);
+};
+
+//////////////////////////////////////////////////////////////////
+
class PVXMLPlayableURL : public PVXMLPlayable
{
PCLASSINFO(PVXMLPlayableURL, PVXMLPlayable);
Modified: ptlib/trunk/src/ptclib/vxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/vxml.cxx 2007-11-26 11:26:28 UTC (rev 18956)
+++ ptlib/trunk/src/ptclib/vxml.cxx 2007-11-26 13:27:08 UTC (rev 18957)
@@ -137,6 +137,19 @@
///////////////////////////////////////////////////////////////
+void PVXMLPlayableStop::Play(PVXMLChannel & channel)
+{
+ channel.Close();
+}
+
+BOOL PVXMLPlayableStop::ReadFrame(PVXMLChannel & channel, void *, PINDEX)
+{
+ channel.Close();
+ return FALSE;
+}
+
+///////////////////////////////////////////////////////////////
+
BOOL PVXMLPlayableFilename::Open(PVXMLChannel & chan, const PString & _fn, PINDEX _delay, PINDEX _repeat, BOOL _autoDelete)
{
fn = _fn;
@@ -538,7 +551,6 @@
vxmlThread = NULL;
threadRunning = FALSE;
vxmlChannel = NULL;
- finishWhenEmpty = TRUE;
textToSpeech = NULL;
loaded = FALSE;
emptyAction = FALSE;
@@ -555,7 +567,6 @@
void PVXMLSession::Initialise()
{
recording = FALSE;
- allowFinish = FALSE;
listening = FALSE;
activeGrammar = NULL;
listening = FALSE;
@@ -663,7 +674,6 @@
{
PWaitAndSignal m(sessionMutex);
- allowFinish = loaded = FALSE;
rootURL = PString::Empty();
// parse the XML
@@ -983,7 +993,7 @@
}
// Determine if we should quit
- if ((currentNode == NULL) && (activeGrammar == NULL) && !IsPlaying() && !IsRecording() && allowFinish && finishWhenEmpty) {
+ if ((currentNode == NULL) && (activeGrammar == NULL) && !IsPlaying() && !IsRecording()) {
threadRunning = FALSE;
waitForEvent.Signal();
}
@@ -1326,8 +1336,6 @@
if (vxmlChannel == NULL || !vxmlChannel->QueueFile(fn, repeat, delay, autoDelete))
return FALSE;
- AllowClearCall();
-
return TRUE;
}
@@ -1336,8 +1344,6 @@
if (vxmlChannel == NULL || !vxmlChannel->QueueCommand(cmd, repeat, delay))
return FALSE;
- AllowClearCall();
-
return TRUE;
}
@@ -1346,8 +1352,6 @@
if (vxmlChannel == NULL || !vxmlChannel->QueueData(data, repeat, delay))
return FALSE;
- AllowClearCall();
-
return TRUE;
}
@@ -1356,8 +1360,6 @@
if (vxmlChannel == NULL || !vxmlChannel->QueuePlayable("Tone", toneSpec, repeat, delay, true))
return FALSE;
- AllowClearCall();
-
return TRUE;
}
@@ -1378,8 +1380,14 @@
if (vxmlChannel == NULL || !vxmlChannel->QueueData(nothing, 1, msecs))
return FALSE;
- AllowClearCall();
+ return TRUE;
+}
+BOOL PVXMLSession::PlayStop()
+{
+ if (vxmlChannel == NULL || !vxmlChannel->QueuePlayable(new PVXMLPlayableStop()))
+ return FALSE;
+
return TRUE;
}
@@ -1388,8 +1396,6 @@
if (vxmlChannel == NULL || !vxmlChannel->QueueResource(url, repeat, delay))
return FALSE;
- AllowClearCall();
-
return TRUE;
}
@@ -1427,8 +1433,6 @@
if (!vxmlChannel->QueuePlayable(playable))
return FALSE;
- AllowClearCall();
-
return TRUE;
}
@@ -1550,11 +1554,6 @@
return new PWAVFile(mode, opts, fmt);
}
-void PVXMLSession::AllowClearCall()
-{
- allowFinish = TRUE;
-}
-
BOOL PVXMLSession::TraverseAudio()
{
if (!currentNode->IsElement()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2007-11-27 19:28:45
|
Revision: 18972
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18972&view=rev
Author: ms30002000
Date: 2007-11-27 11:28:49 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
Added PSyncPoint with variable queue length
Modified Paths:
--------------
ptlib/trunk/include/ptlib/syncpoint.h
ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
ptlib/trunk/src/ptlib/msos/win32.cxx
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/include/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/syncpoint.h 2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/include/ptlib/syncpoint.h 2007-11-27 19:28:49 UTC (rev 18972)
@@ -67,7 +67,8 @@
/** Create a new sync point.
*/
PSyncPoint();
- PSyncPoint(const PSyncPoint &);
+ PSyncPoint(unsigned maxSignals);
+ PSyncPoint(const PSyncPoint & syncPoint);
// Include platform dependent part of class
Modified: ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h
===================================================================
--- ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h 2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/include/ptlib/unix/ptlib/syncpoint.h 2007-11-27 19:28:49 UTC (rev 18972)
@@ -47,6 +47,7 @@
virtual BOOL WillBlock() const;
private:
unsigned signalCount;
+ unsigned maxSignalCount;
#endif
// End Of File ////////////////////////////////////////////////////////////////
Modified: ptlib/trunk/src/ptlib/msos/win32.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/win32.cxx 2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/src/ptlib/msos/win32.cxx 2007-11-27 19:28:49 UTC (rev 18972)
@@ -1409,6 +1409,10 @@
///////////////////////////////////////////////////////////////////////////////
// PSyncPoint
+PSyncPoint::PSyncPoint(unsigned maxSignals)
+ : PSemaphore(::CreateEvent(NULL, FALSE, maxSignals, NULL))
+{
+}
PSyncPoint::PSyncPoint()
: PSemaphore(::CreateEvent(NULL, FALSE, FALSE, NULL))
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2007-11-27 12:07:24 UTC (rev 18971)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2007-11-27 19:28:49 UTC (rev 18972)
@@ -1387,20 +1387,31 @@
}
+PSyncPoint::PSyncPoint(unsigned maxSignals)
+ : PSemaphore(PXSyncPoint)
+{
+ PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
+ PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
+ signalCount = 0;
+ maxSignalCount = maxSignals;
+}
+
PSyncPoint::PSyncPoint()
: PSemaphore(PXSyncPoint)
{
PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
signalCount = 0;
+ maxSignalCount = 0;
}
-PSyncPoint::PSyncPoint(const PSyncPoint &)
+PSyncPoint::PSyncPoint(const PSyncPoint & syncPoint)
: PSemaphore(PXSyncPoint)
{
PAssertPTHREAD(pthread_mutex_init, (&mutex, NULL));
PAssertPTHREAD(pthread_cond_init, (&condVar, NULL));
signalCount = 0;
+ maxSignalCount = syncPoint.maxSignalCount;
}
PSyncPoint::~PSyncPoint()
@@ -1450,7 +1461,8 @@
void PSyncPoint::Signal()
{
PAssertPTHREAD(pthread_mutex_lock, (&mutex));
- signalCount++;
+ if ((maxSignalCount == 0) || (signalCount < maxSignalCount))
+ signalCount++;
PAssertPTHREAD(pthread_cond_signal, (&condVar));
PAssertPTHREAD(pthread_mutex_unlock, (&mutex));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X