Index: /pjproject/main/Makefile
===================================================================
--- /pjproject/main/Makefile	(revision 1)
+++ /pjproject/main/Makefile	(revision 3)
@@ -1,8 +1,6 @@
 DIRS = pjlib pjsdp pjmedia pjsip
 
-MAKE_FLAGS := TARGET=$(TARGET)
-
 ifdef MINSIZE
-MAKE_FLAGS := $(MAKE_FLAGS) MINSIZE=1
+MAKE_FLAGS := MINSIZE=1
 endif
 
@@ -22,8 +20,5 @@
 BINS = pjsip/bin/pjsua$(EXE) 
 
-include pjlib/build/make-$(TARGET).inc
-
 size:
-	@echo 'TARGET=$(TARGET)'
 	@echo -n 'Date: '
 	@date
@@ -42,2 +37,16 @@
 	done
 
+dos2unix:
+	for f in `find . | egrep '(mak|h|c|S|s|Makefile)$$'`; do \
+		dos2unix "$$f" > dos2unix.tmp; \
+		cp dos2unix.tmp "$$f"; \
+	done
+	rm -f dos2unix.tmp
+
+xhdrid:
+	for f in `find . | egrep '\.(h|c|S|s|cpp|hpp)$$'`; do \
+		echo Processing $$f...; \
+		cat $$f | sed 's/.*\$$Author\$$/ */' > /tmp/id; \
+		cp /tmp/id $$f; \
+	done
+
Index: /pjproject/main/build.mak
===================================================================
--- /pjproject/main/build.mak	(revision 1)
+++ /pjproject/main/build.mak	(revision 3)
@@ -54,2 +54,10 @@
 #export KERNEL_ARCH = ARCH=um
 
+#
+# SunOS, sparc, gcc
+#
+#export MACHINE_NAME := sparc
+#export OS_NAME := sunos
+#export CC_NAME := gcc
+#export HOST_NAME := unix
+
Index: /pjproject/main/build/cc-gcc.mak
===================================================================
--- /pjproject/main/build/cc-gcc.mak	(revision 1)
+++ /pjproject/main/build/cc-gcc.mak	(revision 3)
Index: /pjproject/main/build/cc-vc.mak
===================================================================
--- /pjproject/main/build/cc-vc.mak	(revision 1)
+++ /pjproject/main/build/cc-vc.mak	(revision 3)
Index: /pjproject/main/build/host-mingw.mak
===================================================================
--- /pjproject/main/build/host-mingw.mak	(revision 1)
+++ /pjproject/main/build/host-mingw.mak	(revision 3)
Index: /pjproject/main/build/host-unix.mak
===================================================================
--- /pjproject/main/build/host-unix.mak	(revision 1)
+++ /pjproject/main/build/host-unix.mak	(revision 3)
Index: /pjproject/main/build/host-win32.mak
===================================================================
--- /pjproject/main/build/host-win32.mak	(revision 1)
+++ /pjproject/main/build/host-win32.mak	(revision 3)
Index: /pjproject/main/build/m-alpha.mak
===================================================================
--- /pjproject/main/build/m-alpha.mak	(revision 1)
+++ /pjproject/main/build/m-alpha.mak	(revision 3)
Index: /pjproject/main/build/m-i386.mak
===================================================================
--- /pjproject/main/build/m-i386.mak	(revision 1)
+++ /pjproject/main/build/m-i386.mak	(revision 3)
Index: /pjproject/main/build/m-m68k.mak
===================================================================
--- /pjproject/main/build/m-m68k.mak	(revision 1)
+++ /pjproject/main/build/m-m68k.mak	(revision 3)
Index: /pjproject/main/build/m-sparc.mak
===================================================================
--- /pjproject/main/build/m-sparc.mak	(revision 3)
+++ /pjproject/main/build/m-sparc.mak	(revision 3)
@@ -0,0 +1,4 @@
+export M_CFLAGS := $(CC_DEF)PJ_M_SPARC=1
+export M_CXXFLAGS :=
+export M_LDFLAGS :=
+export M_SOURCES :=
Index: /pjproject/main/build/os-linux-kernel.mak
===================================================================
--- /pjproject/main/build/os-linux-kernel.mak	(revision 1)
+++ /pjproject/main/build/os-linux-kernel.mak	(revision 3)
Index: /pjproject/main/build/os-linux.mak
===================================================================
--- /pjproject/main/build/os-linux.mak	(revision 1)
+++ /pjproject/main/build/os-linux.mak	(revision 3)
Index: /pjproject/main/build/os-palmos.mak
===================================================================
--- /pjproject/main/build/os-palmos.mak	(revision 1)
+++ /pjproject/main/build/os-palmos.mak	(revision 3)
Index: /pjproject/main/build/os-sunos.mak
===================================================================
--- /pjproject/main/build/os-sunos.mak	(revision 3)
+++ /pjproject/main/build/os-sunos.mak	(revision 3)
@@ -0,0 +1,12 @@
+export OS_CFLAGS   := $(CC_DEF)PJ_SUNOS=1
+
+export OS_CXXFLAGS := 
+
+export OS_LDFLAGS  := $(CC_LIB)pthread$(LIBEXT2) \
+		      $(CC_LIB)socket$(LIBEXT2) \
+		      $(CC_LIB)rt$(LIBEXT2) \
+		      $(CC_LIB)nsl$(LIBEXT2)
+
+export OS_SOURCES  := 
+
+
Index: /pjproject/main/build/os-win32.mak
===================================================================
--- /pjproject/main/build/os-win32.mak	(revision 1)
+++ /pjproject/main/build/os-win32.mak	(revision 3)
Index: /pjproject/main/build/rules.mak
===================================================================
--- /pjproject/main/build/rules.mak	(revision 1)
+++ /pjproject/main/build/rules.mak	(revision 3)
@@ -149,13 +149,14 @@
 	for F in $(FULL_SRCS); do \
 	   if test -f $$F; then \
-	     echo -n $(OBJDIR)/ >> $(DEP_FILE); \
+	     bash -c "echo -n $(OBJDIR)/" >> $(DEP_FILE); \
 	     if gcc -MM $(DEPFLAGS) $$F | sed '/^#/d' >> $(DEP_FILE); then \
 		true; \
 	     else \
 		echo 'err:' >> $(DEP_FILE); \
+		rm -f $(DEP_FILE); \
 		exit 1; \
 	     fi; \
 	   fi; \
-	done
+	done;
 
 dep: depend
Index: /pjproject/main/pjlib/build/Makefile
===================================================================
--- /pjproject/main/pjlib/build/Makefile	(revision 1)
+++ /pjproject/main/pjlib/build/Makefile	(revision 3)
@@ -61,5 +61,5 @@
 # Gather all flags.
 #
-export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+export _CFLAGS 	:= -O2 $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
 		   $(CFLAGS) $(CC_INC)../include
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
Index: /pjproject/main/pjlib/build/os-linux-kernel.mak
===================================================================
--- /pjproject/main/pjlib/build/os-linux-kernel.mak	(revision 1)
+++ /pjproject/main/pjlib/build/os-linux-kernel.mak	(revision 3)
Index: /pjproject/main/pjlib/build/os-linux.mak
===================================================================
--- /pjproject/main/pjlib/build/os-linux.mak	(revision 1)
+++ /pjproject/main/pjlib/build/os-linux.mak	(revision 3)
Index: /pjproject/main/pjlib/build/os-sunos.mak
===================================================================
--- /pjproject/main/pjlib/build/os-sunos.mak	(revision 3)
+++ /pjproject/main/pjlib/build/os-sunos.mak	(revision 3)
@@ -0,0 +1,36 @@
+#
+# PJLIB OS specific configuration for SunOS target. 
+#
+
+#
+# PJLIB_OBJS specified here are object files to be included in PJLIB
+# (the library) for this specific operating system. Object files common 
+# to all operating systems should go in Makefile instead.
+#
+export PJLIB_OBJS += 	addr_resolv_sock.o guid_simple.o \
+			log_writer_stdout.o os_core_unix.o \
+			os_error_unix.o os_time_ansi.o \
+			os_timestamp_common.o os_timestamp_linux.o \
+			os_time_ansi.o \
+			pool_policy_malloc.o sock_bsd.o sock_select.o
+
+export PJLIB_OBJS += ioqueue_select.o 
+#export PJLIB_OBJS += ioqueue_epoll.o
+
+#
+# TEST_OBJS are operating system specific object files to be included in
+# the test application.
+#
+export TEST_OBJS +=	main.o
+
+#
+# Additional LDFLAGS for pjlib-test
+#
+export TEST_LDFLAGS += -lm
+
+#
+# TARGETS are make targets in the Makefile, to be executed for this given
+# operating system.
+#
+export TARGETS	    =	pjlib pjlib-test
+
Index: /pjproject/main/pjlib/build/os-win32.mak
===================================================================
--- /pjproject/main/pjlib/build/os-win32.mak	(revision 1)
+++ /pjproject/main/pjlib/build/os-win32.mak	(revision 3)
Index: /pjproject/main/pjlib/build/pjlib_samples.mak
===================================================================
--- /pjproject/main/pjlib/build/pjlib_samples.mak	(revision 1)
+++ /pjproject/main/pjlib/build/pjlib_samples.mak	(revision 3)
Index: /pjproject/main/pjlib/docs/doxygen.css
===================================================================
--- /pjproject/main/pjlib/docs/doxygen.css	(revision 1)
+++ /pjproject/main/pjlib/docs/doxygen.css	(revision 3)
Index: /pjproject/main/pjlib/include/pj/addr_resolv.h
===================================================================
--- /pjproject/main/pjlib/include/pj/addr_resolv.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/addr_resolv.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/addr_resolv.h 2     10/14/05 12:25a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_ADDR_RESOLV_H__
Index: /pjproject/main/pjlib/include/pj/array.h
===================================================================
--- /pjproject/main/pjlib/include/pj/array.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/array.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/array.h 7     10/14/05 12:25a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_ARRAY_H__
 #define __PJ_ARRAY_H__
Index: /pjproject/main/pjlib/include/pj/assert.h
===================================================================
--- /pjproject/main/pjlib/include/pj/assert.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/assert.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/assert.h 4     10/14/05 12:25a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_ASSERT_H__
 #define __PJ_ASSERT_H__
Index: /pjproject/main/pjlib/include/pj/compat/assert.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/assert.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/assert.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/assert.h 3     9/22/05 10:31a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/assert.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/cc_gcc.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/cc_gcc.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/cc_gcc.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/cc_gcc.h 2     9/17/05 10:37a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/cc_gcc.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/cc_msvc.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/cc_msvc.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/cc_msvc.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/cc_msvc.h 3     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/cc_msvc.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/ctype.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/ctype.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/ctype.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/ctype.h 3     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/ctype.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/errno.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/errno.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/errno.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/errno.h 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_COMPAT_ERRNO_H__
 #define __PJ_COMPAT_ERRNO_H__
@@ -10,5 +12,6 @@
 
 #elif (defined(PJ_LINUX) && PJ_LINUX != 0) || \
-      (defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0)
+      (defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL != 0) || \
+      (defined(PJ_SUNOS) && PJ_SUNOS != 0)
 
     typedef int pj_os_err_type;
Index: /pjproject/main/pjlib/include/pj/compat/high_precision.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/high_precision.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/high_precision.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/high_precision.h 3     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_COMPAT_HIGH_PRECISION_H__
 #define __PJ_COMPAT_HIGH_PRECISION_H__
@@ -36,4 +38,6 @@
 
 #else
+#   warning "High precision math is not available"
+
     /*
      * Last, fallback to 32-bit arithmetics.
Index: /pjproject/main/pjlib/include/pj/compat/m_alpha.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/m_alpha.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/m_alpha.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/m_alpha.h 1     10/29/05 5:23p Bennylp $ */
+/* $Id$
+ *
+ */
 /* 
  * $Log: /pjproject-0.3/pjlib/include/pj/compat/m_alpha.h $
Index: /pjproject/main/pjlib/include/pj/compat/m_i386.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/m_i386.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/m_i386.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/m_i386.h 3     9/21/05 1:39p Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/m_i386.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/m_m68k.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/m_m68k.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/m_m68k.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/m_m68k.h 2     9/17/05 10:37a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/m_m68k.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/m_sparc.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/m_sparc.h	(revision 3)
+++ /pjproject/main/pjlib/include/pj/compat/m_sparc.h	(revision 3)
@@ -0,0 +1,23 @@
+/* $Id$
+ *
+ */
+/* 
+ *$Log:  $
+ * 
+ */
+#ifndef __PJ_COMPAT_M_SPARC_H__
+#define __PJ_COMPAT_M_SPARC_H__
+
+/**
+ * @file m_sparc.h
+ * @brief Describes SPARC family processor specifics.
+ */
+
+#define PJ_SPARC		1
+
+#define PJ_HAS_PENTIUM		0
+#define PJ_IS_LITTLE_ENDIAN	0
+#define PJ_IS_BIG_ENDIAN	1
+
+
+#endif	/* __PJ_COMPAT_M_SPARC_H__ */
Index: /pjproject/main/pjlib/include/pj/compat/malloc.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/malloc.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/malloc.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/malloc.h 2     9/17/05 10:37a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/malloc.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/os_linux.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/os_linux.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/os_linux.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/os_linux.h 6     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/os_linux.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/os_linux_kernel.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/os_linux_kernel.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/os_linux_kernel.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/os_linux_kernel.h 4     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/os_linux_kernel.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/os_palmos.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/os_palmos.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/os_palmos.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/os_palmos.h 3     9/21/05 1:39p Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/os_palmos.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/os_sunos.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/os_sunos.h	(revision 3)
+++ /pjproject/main/pjlib/include/pj/compat/os_sunos.h	(revision 3)
@@ -0,0 +1,58 @@
+/* $Id$
+ *
+ */
+/* $Log:  $
+ * 
+ */
+#ifndef __PJ_COMPAT_OS_SUNOS_H__
+#define __PJ_COMPAT_OS_SUNOS_H__
+
+/**
+ * @file os_sunos.h
+ * @brief Describes SunOS/Solaris operating system specifics.
+ */
+
+#define PJ_HAS_ARPA_INET_H	    1
+#define PJ_HAS_ASSERT_H		    1
+#define PJ_HAS_CTYPE_H		    1
+#define PJ_HAS_ERRNO_H		    1
+#define PJ_HAS_LINUX_SOCKET_H	    0
+#define PJ_HAS_MALLOC_H		    1
+#define PJ_HAS_NETDB_H		    1
+#define PJ_HAS_NETINET_IN_H	    1
+#define PJ_HAS_SETJMP_H		    1
+#define PJ_HAS_STDARG_H		    1
+#define PJ_HAS_STDDEF_H		    1
+#define PJ_HAS_STDIO_H		    1
+#define PJ_HAS_STDLIB_H		    1
+#define PJ_HAS_STRING_H		    1
+#define PJ_HAS_SYS_IOCTL_H	    1
+#define PJ_HAS_SYS_SELECT_H	    1
+#define PJ_HAS_SYS_SOCKET_H	    1
+#define PJ_HAS_SYS_TIMEB_H	    1
+#define PJ_HAS_SYS_TYPES_H	    1
+#define PJ_HAS_TIME_H		    1
+#define PJ_HAS_UNISTD_H		    1
+
+#define PJ_HAS_MSWSOCK_H	    0
+#define PJ_HAS_WINSOCK_H	    0
+#define PJ_HAS_WINSOCK2_H	    0
+
+#define PJ_SOCK_HAS_INET_ATON	    0
+
+/* Default threading is enabled, unless it's overridden. */
+#ifndef PJ_HAS_THREADS
+#  define PJ_HAS_THREADS	    (1)
+#endif
+
+#define PJ_HAS_HIGH_RES_TIMER	    1
+#define PJ_HAS_MALLOC               1
+#define PJ_OS_HAS_CHECK_STACK	    0
+
+#define PJ_ATOMIC_VALUE_TYPE	    long
+
+/* Get BSD related identifers in Sun's include files */
+#define BSD_COMP
+
+#endif	/* __PJ_COMPAT_OS_SUNOS_H__ */
+
Index: /pjproject/main/pjlib/include/pj/compat/os_win32.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/os_win32.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/os_win32.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/os_win32.h 6     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/os_win32.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/rand.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/rand.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/rand.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/rand.h 3     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/rand.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/setjmp.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/setjmp.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/setjmp.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/setjmp.h 4     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/setjmp.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/size_t.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/size_t.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/size_t.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/size_t.h 2     9/21/05 1:39p Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/size_t.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/socket.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/socket.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/socket.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/socket.h 5     10/29/05 11:51a Bennylp $*/
+/* $Id$
+ *
+*/
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/socket.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/sprintf.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/sprintf.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/sprintf.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/compat/sprintf.h 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/compat/sprintf.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/stdarg.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/stdarg.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/stdarg.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/stdarg.h 1     9/17/05 10:36a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/stdarg.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/stdfileio.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/stdfileio.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/stdfileio.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/stdfileio.h 1     9/17/05 10:36a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/stdfileio.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/string.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/string.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/string.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/string.h 3     9/22/05 10:31a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/string.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/time.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/time.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/time.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/time.h 1     9/17/05 10:36a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/time.h $
  * 
Index: /pjproject/main/pjlib/include/pj/compat/vsprintf.h
===================================================================
--- /pjproject/main/pjlib/include/pj/compat/vsprintf.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/compat/vsprintf.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/vsprintf.h 1     9/17/05 10:36a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/compat/vsprintf.h $
  * 
Index: /pjproject/main/pjlib/include/pj/config.h
===================================================================
--- /pjproject/main/pjlib/include/pj/config.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/config.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/config.h 12    10/29/05 10:25p Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_CONFIG_H__
@@ -22,14 +24,16 @@
 
 /********************************************************************
- * Include target specific configuration.
- */
-#if defined(PJ_WIN32)
+ * Include target OS specific configuration.
+ */
+#if defined(PJ_WIN32) && PJ_WIN32!=0
 #  include <pj/compat/os_win32.h>
-#elif defined(PJ_LINUX)
+#elif defined(PJ_LINUX) && PJ_LINUX!=0
 #  include <pj/compat/os_linux.h>
-#elif defined(PJ_LINUX_KERNEL)
+#elif defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL!=0
 #  include <pj/compat/os_linux_kernel.h>
-#elif defined(PJ_PALMOS)
+#elif defined(PJ_PALMOS) && PJ_PALMOS!=0
 #  include <pj/compat/os_palmos.h>
+#elif defined(PJ_SUNOS) && PJ_SUNOS!=0
+#  include <pj/compat/os_sunos.h>
 #else
 #  error "Please specify target os."
@@ -41,9 +45,11 @@
  */
 #if defined (PJ_M_I386) && PJ_M_I386 != 0
-#  include <pj/compat/m_i386.h>
+#   include <pj/compat/m_i386.h>
 #elif defined (PJ_M_M68K) && PJ_M_M68K != 0
 #   include <pj/compat/m_m68k.h>
 #elif defined (PJ_M_ALPHA) && PJ_M_ALPHA != 0
 #   include <pj/compat/m_alpha.h>
+#elif defined (PJ_M_SPARC) && PJ_M_SPARC != 0
+#   include <pj/compat/m_sparc.h>
 #else
 #  error "Please specify target machine."
Index: /pjproject/main/pjlib/include/pj/ctype.h
===================================================================
--- /pjproject/main/pjlib/include/pj/ctype.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/ctype.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/ctype.h 4     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_CTYPE_H__
 #define __PJ_CTYPE_H__
Index: /pjproject/main/pjlib/include/pj/doxygen.h
===================================================================
--- /pjproject/main/pjlib/include/pj/doxygen.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/doxygen.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/doxygen.h 5     10/29/05 10:27p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_DOXYGEN_H__
 #define __PJ_DOXYGEN_H__
Index: /pjproject/main/pjlib/include/pj/equeue.h
===================================================================
--- /pjproject/main/pjlib/include/pj/equeue.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/equeue.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/equeue.h 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_EQUEUE_H__
 #define __PJ_EQUEUE_H__
Index: /pjproject/main/pjlib/include/pj/errno.h
===================================================================
--- /pjproject/main/pjlib/include/pj/errno.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/errno.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/errno.h 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_ERRNO_H__
 #define __PJ_ERRNO_H__
Index: /pjproject/main/pjlib/include/pj/except.h
===================================================================
--- /pjproject/main/pjlib/include/pj/except.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/except.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/except.h 9     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_EXCEPTION_H__
Index: /pjproject/main/pjlib/include/pj/fifobuf.h
===================================================================
--- /pjproject/main/pjlib/include/pj/fifobuf.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/fifobuf.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/fifobuf.h 4     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_FIFOBUF_H__
Index: /pjproject/main/pjlib/include/pj/guid.h
===================================================================
--- /pjproject/main/pjlib/include/pj/guid.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/guid.h	(revision 3)
Index: /pjproject/main/pjlib/include/pj/hash.h
===================================================================
--- /pjproject/main/pjlib/include/pj/hash.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/hash.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/hash.h 6     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_HASH_H__
Index: /pjproject/main/pjlib/include/pj/ioqueue.h
===================================================================
--- /pjproject/main/pjlib/include/pj/ioqueue.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/ioqueue.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/ioqueue.h 10    10/29/05 11:29a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_IOQUEUE_H__
Index: /pjproject/main/pjlib/include/pj/list.h
===================================================================
--- /pjproject/main/pjlib/include/pj/list.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/list.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/list.h 8     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_LIST_H__
Index: /pjproject/main/pjlib/include/pj/list_i.h
===================================================================
--- /pjproject/main/pjlib/include/pj/list_i.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/list_i.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/list_i.h 4     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 
Index: /pjproject/main/pjlib/include/pj/lock.h
===================================================================
--- /pjproject/main/pjlib/include/pj/lock.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/lock.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/lock.h 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJ_LOCK_H__
 #define __PJ_LOCK_H__
Index: /pjproject/main/pjlib/include/pj/log.h
===================================================================
--- /pjproject/main/pjlib/include/pj/log.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/log.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/log.h 7     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_LOG_H__
Index: /pjproject/main/pjlib/include/pj/md5.h
===================================================================
--- /pjproject/main/pjlib/include/pj/md5.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/md5.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/md5.h 5     9/17/05 10:37a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
   Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
Index: /pjproject/main/pjlib/include/pj/os.h
===================================================================
--- /pjproject/main/pjlib/include/pj/os.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/os.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/os.h 12    10/29/05 11:30a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_OS_H__
@@ -58,5 +60,5 @@
  */
 #if !defined(PJ_THREAD_DESC_SIZE)
-#   define PJ_THREAD_DESC_SIZE	    (PJ_MAX_OBJ_NAME + 10*sizeof(long))
+#   define PJ_THREAD_DESC_SIZE	    (16)
 #endif
 
@@ -65,5 +67,5 @@
  * or native API. 
  */
-typedef pj_uint8_t pj_thread_desc[PJ_THREAD_DESC_SIZE];
+typedef long pj_thread_desc[PJ_THREAD_DESC_SIZE];
 
 /**
@@ -245,5 +247,5 @@
  * @param value	    The value.
  */
-PJ_DECL(void) pj_thread_local_set(long index, void *value);
+PJ_DECL(pj_status_t) pj_thread_local_set(long index, void *value);
 
 /**
@@ -784,6 +786,11 @@
     struct
     {
+#if defined(PJ_IS_LITTLE_ENDIAN) && PJ_IS_LITTLE_ENDIAN!=0
 	pj_uint32_t lo;     /**< Low 32-bit value of the 64-bit value. */
 	pj_uint32_t hi;     /**< high 32-bit value of the 64-bit value. */
+#else
+	pj_uint32_t hi;     /**< high 32-bit value of the 64-bit value. */
+	pj_uint32_t lo;     /**< Low 32-bit value of the 64-bit value. */
+#endif
     } u32;                  /**< The 64-bit value as two 32-bit values. */
 
Index: /pjproject/main/pjlib/include/pj/pool.h
===================================================================
--- /pjproject/main/pjlib/include/pj/pool.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/pool.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/pool.h 10    10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_POOL_H__
Index: /pjproject/main/pjlib/include/pj/pool_i.h
===================================================================
--- /pjproject/main/pjlib/include/pj/pool_i.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/pool_i.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/pool_i.h 6     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 
Index: /pjproject/main/pjlib/include/pj/rand.h
===================================================================
--- /pjproject/main/pjlib/include/pj/rand.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/rand.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/rand.h 3     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/rand.h $
  * 
Index: /pjproject/main/pjlib/include/pj/rbtree.h
===================================================================
--- /pjproject/main/pjlib/include/pj/rbtree.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/rbtree.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/rbtree.h 5     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_RBTREE_H__
Index: /pjproject/main/pjlib/include/pj/scanner.h
===================================================================
--- /pjproject/main/pjlib/include/pj/scanner.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/scanner.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/scanner.h 10    10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_PARSER_H__
Index: /pjproject/main/pjlib/include/pj/sock.h
===================================================================
--- /pjproject/main/pjlib/include/pj/sock.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/sock.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/sock.h 10    10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_SOCK_H__
Index: /pjproject/main/pjlib/include/pj/sock_select.h
===================================================================
--- /pjproject/main/pjlib/include/pj/sock_select.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/sock_select.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/sock_select.h 3     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/include/pj/sock_select.h $
  * 
Index: /pjproject/main/pjlib/include/pj/string.h
===================================================================
--- /pjproject/main/pjlib/include/pj/string.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/string.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/string.h 8     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_STRING_H__
Index: /pjproject/main/pjlib/include/pj/string_i.h
===================================================================
--- /pjproject/main/pjlib/include/pj/string_i.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/string_i.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/string_i.h 8     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 PJ_IDEF(pj_str_t) pj_str(char *str)
Index: /pjproject/main/pjlib/include/pj/stun.h
===================================================================
--- /pjproject/main/pjlib/include/pj/stun.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/stun.h	(revision 3)
Index: /pjproject/main/pjlib/include/pj/timer.h
===================================================================
--- /pjproject/main/pjlib/include/pj/timer.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/timer.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/timer.h 7     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* (C)1993-2003 Douglas C. Schmidt
  *
Index: /pjproject/main/pjlib/include/pj/types.h
===================================================================
--- /pjproject/main/pjlib/include/pj/types.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/types.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/types.h 11    10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_TYPES_H__
Index: /pjproject/main/pjlib/include/pj/xml.h
===================================================================
--- /pjproject/main/pjlib/include/pj/xml.h	(revision 1)
+++ /pjproject/main/pjlib/include/pj/xml.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pj/xml.h 4     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJ_XML_H__
Index: /pjproject/main/pjlib/include/pjlib++.hpp
===================================================================
--- /pjproject/main/pjlib/include/pjlib++.hpp	(revision 1)
+++ /pjproject/main/pjlib/include/pjlib++.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pjlib++.hpp 1     7/05/05 12:58a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJLIBPP_H__
 #define __PJLIBPP_H__
Index: /pjproject/main/pjlib/include/pjlib.h
===================================================================
--- /pjproject/main/pjlib/include/pjlib.h	(revision 1)
+++ /pjproject/main/pjlib/include/pjlib.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/include/pjlib.h 6     10/29/05 11:30a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJLIB_H__
 #define __PJLIB_H__
Index: /pjproject/main/pjlib/src/pj++/compiletest.cpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/compiletest.cpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/compiletest.cpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/compiletest.cpp 4     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjlib++.hpp>
 
Index: /pjproject/main/pjlib/src/pj++/hash.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/hash.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/hash.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/hash.hpp 5     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_HASH_H__
 #define __PJPP_HASH_H__
Index: /pjproject/main/pjlib/src/pj++/ioqueue.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/ioqueue.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/ioqueue.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/ioqueue.hpp 4     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_IOQUEUE_H__
 #define __PJPP_IOQUEUE_H__
Index: /pjproject/main/pjlib/src/pj++/list.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/list.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/list.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/list.hpp 2     2/24/05 11:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_LIST_H__
 #define __PJPP_LIST_H__
Index: /pjproject/main/pjlib/src/pj++/os.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/os.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/os.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/os.hpp 2     2/24/05 11:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_OS_H__
 #define __PJPP_OS_H__
Index: /pjproject/main/pjlib/src/pj++/pj++.cpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/pj++.cpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/pj++.cpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/pj++.cpp 4     4/17/05 11:59a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pj++/scanner.hpp>
 #include <pj++/timer.hpp>
Index: /pjproject/main/pjlib/src/pj++/pool.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/pool.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/pool.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/pool.hpp 4     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_POOL_H__
 #define __PJPP_POOL_H__
Index: /pjproject/main/pjlib/src/pj++/proactor.cpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/proactor.cpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/proactor.cpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj++/proactor.cpp 7     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pj++/proactor.hpp>
 #include <pj/string.h>	// memset
Index: /pjproject/main/pjlib/src/pj++/proactor.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/proactor.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/proactor.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/proactor.hpp 3     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_EVENT_HANDLER_H__
 #define __PJPP_EVENT_HANDLER_H__
Index: /pjproject/main/pjlib/src/pj++/scanner.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/scanner.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/scanner.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/scanner.hpp 3     2/27/05 10:09p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_SCANNER_H__
 #define __PJPP_SCANNER_H__
Index: /pjproject/main/pjlib/src/pj++/sock.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/sock.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/sock.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/sock.hpp 2     2/24/05 11:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_SOCK_H__
 #define __PJPP_SOCK_H__
Index: /pjproject/main/pjlib/src/pj++/string.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/string.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/string.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/string.hpp 2     2/24/05 11:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_STRING_H__
 #define __PJPP_STRING_H__
Index: /pjproject/main/pjlib/src/pj++/timer.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/timer.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/timer.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/timer.hpp 4     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_TIMER_H__
 #define __PJPP_TIMER_H__
Index: /pjproject/main/pjlib/src/pj++/tree.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/tree.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/tree.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/tree.hpp 2     2/24/05 11:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_TREE_H__
 #define __PJPP_TREE_H__
Index: /pjproject/main/pjlib/src/pj++/types.hpp
===================================================================
--- /pjproject/main/pjlib/src/pj++/types.hpp	(revision 1)
+++ /pjproject/main/pjlib/src/pj++/types.hpp	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjlib/src/pj++/types.hpp 3     4/17/05 11:59a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJPP_TYPES_H__
 #define __PJPP_TYPES_H__
Index: /pjproject/main/pjlib/src/pj/addr_resolv_linux_kernel.c
===================================================================
--- /pjproject/main/pjlib/src/pj/addr_resolv_linux_kernel.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/addr_resolv_linux_kernel.c	(revision 3)
@@ -1,7 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/addr_resolv_linux_kernel.c 1     10/05/05 4:41p Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/addr_resolv_linux_kernel.c $
- * 
- * 1     10/05/05 4:41p Bennylp
- * Created.
+/* $Id$
  *
  */
Index: /pjproject/main/pjlib/src/pj/addr_resolv_sock.c
===================================================================
--- /pjproject/main/pjlib/src/pj/addr_resolv_sock.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/addr_resolv_sock.c	(revision 3)
@@ -1,11 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/addr_resolv_sock.c 2     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/addr_resolv_sock.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/22/05 10:38a Bennylp
- * Created.
+/* $Id$
  *
  */
Index: /pjproject/main/pjlib/src/pj/array.c
===================================================================
--- /pjproject/main/pjlib/src/pj/array.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/array.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/array.c 5     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/array.c $
- * 
- * 5     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 4     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/array.h>
Index: /pjproject/main/pjlib/src/pj/compat/longjmp_i386.S
===================================================================
--- /pjproject/main/pjlib/src/pj/compat/longjmp_i386.S	(revision 1)
+++ /pjproject/main/pjlib/src/pj/compat/longjmp_i386.S	(revision 3)
Index: /pjproject/main/pjlib/src/pj/compat/setjmp_i386.S
===================================================================
--- /pjproject/main/pjlib/src/pj/compat/setjmp_i386.S	(revision 1)
+++ /pjproject/main/pjlib/src/pj/compat/setjmp_i386.S	(revision 3)
Index: /pjproject/main/pjlib/src/pj/compat/sigjmp.c
===================================================================
--- /pjproject/main/pjlib/src/pj/compat/sigjmp.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/compat/sigjmp.c	(revision 3)
@@ -1,2 +1,5 @@
+/* $Id$
+ *
+ */
 #include <pj/config.h>
 #include <pj/compat/setjmp.h>
Index: /pjproject/main/pjlib/src/pj/compat/string.c
===================================================================
--- /pjproject/main/pjlib/src/pj/compat/string.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/compat/string.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/compat/string.c 1     9/22/05 10:43a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/compat/string.c $
- * 
- * 1     9/22/05 10:43a Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/types.h>
Index: /pjproject/main/pjlib/src/pj/config.c
===================================================================
--- /pjproject/main/pjlib/src/pj/config.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/config.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/config.c 7     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/config.c $
- * 
- * 7     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 6     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 5     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/config.h>
@@ -39,2 +28,3 @@
     PJ_LOG(3, (id, " PJ_IOQUEUE_MAX_HANDLES   : %d", PJ_IOQUEUE_MAX_HANDLES));
 }
+
Index: /pjproject/main/pjlib/src/pj/equeue_winnt.c
===================================================================
--- /pjproject/main/pjlib/src/pj/equeue_winnt.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/equeue_winnt.c	(revision 3)
@@ -1,12 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/equeue_winnt.c 2     10/14/05 12:26a Bennylp $ */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pj/equeue_winnt.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/05/05 6:19p Bennylp
- * Created.
+/* $Id$
  *
  */
Index: /pjproject/main/pjlib/src/pj/errno.c
===================================================================
--- /pjproject/main/pjlib/src/pj/errno.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/errno.c	(revision 3)
@@ -1,12 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/errno.c 2     10/14/05 12:26a Bennylp $ */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pj/errno.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/08/05 9:53a Bennylp
- * Created.
+/* $Id$
  *
  */
Index: /pjproject/main/pjlib/src/pj/except.c
===================================================================
--- /pjproject/main/pjlib/src/pj/except.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/except.c	(revision 3)
@@ -1,16 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/except.c 6     10/14/05 12:26a Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/except.c $
- * 
- * 6     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 5     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 4     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/except.h>
Index: /pjproject/main/pjlib/src/pj/extra-exports.c
===================================================================
--- /pjproject/main/pjlib/src/pj/extra-exports.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/extra-exports.c	(revision 3)
@@ -1,11 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/extra-exports.c 1     10/29/05 11:56a Bennylp $ */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pj/extra-exports.c $
- * 
- * 1     10/29/05 11:56a Bennylp
- * Version 0.3-pre2
+/* $Id$
  *
  */
-
 /*
  * This file contains code to export extra symbols from Linux kernel.
Index: /pjproject/main/pjlib/src/pj/fifobuf.c
===================================================================
--- /pjproject/main/pjlib/src/pj/fifobuf.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/fifobuf.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/fifobuf.c 4     9/17/05 10:37a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/fifobuf.c $
- * 
- * 4     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/fifobuf.h>
Index: /pjproject/main/pjlib/src/pj/guid.c
===================================================================
--- /pjproject/main/pjlib/src/pj/guid.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/guid.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/guid.c 12    10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/guid.c $
- * 
- * 12    10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 11    9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/guid.h>
Index: /pjproject/main/pjlib/src/pj/guid_simple.c
===================================================================
--- /pjproject/main/pjlib/src/pj/guid_simple.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/guid_simple.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/guid_simple.c 3     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/guid_simple.c $
- * 
- * 3     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 2     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/guid.h>
Index: /pjproject/main/pjlib/src/pj/guid_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/guid_win32.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/guid_win32.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/guid_win32.c 4     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/guid_win32.c $
- * 
- * 4     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 3     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/guid.h>
Index: /pjproject/main/pjlib/src/pj/hash.c
===================================================================
--- /pjproject/main/pjlib/src/pj/hash.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/hash.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/hash.c 8     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/hash.c $
- * 
- * 8     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 7     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/hash.h>
Index: /pjproject/main/pjlib/src/pj/ioqueue_dummy.c
===================================================================
--- /pjproject/main/pjlib/src/pj/ioqueue_dummy.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/ioqueue_dummy.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/ioqueue_dummy.c 2     10/29/05 11:31a Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/ioqueue_dummy.c $
- * 
- * 2     10/29/05 11:31a Bennylp
- * Changed accept and lock.
- * 
- * 1     10/23/05 12:53p Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/ioqueue.h>
Index: /pjproject/main/pjlib/src/pj/ioqueue_epoll.c
===================================================================
--- /pjproject/main/pjlib/src/pj/ioqueue_epoll.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/ioqueue_epoll.c	(revision 3)
@@ -1,20 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/ioqueue_epoll.c 4     10/29/05 10:27p Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/ioqueue_epoll.c $
- * 
- * 4     10/29/05 10:27p Bennylp
- * Fixed misc warnings.
- * 
- * 3     10/29/05 11:49a Bennylp
- * Fixed warnings.
- * 
- * 2     10/29/05 11:31a Bennylp
- * Changed accept and lock.
- * 
- * 1     10/17/05 10:49p Bennylp
- * Created.
- * 
- */
-
+/* $Id$
+ *
+ */
 /*
  * ioqueue_epoll.c
Index: /pjproject/main/pjlib/src/pj/ioqueue_linux_kernel.c
===================================================================
--- /pjproject/main/pjlib/src/pj/ioqueue_linux_kernel.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/ioqueue_linux_kernel.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/ioqueue_linux_kernel.c 1     10/05/05 4:42p Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/ioqueue_linux_kernel.c $
- * 
- * 1     10/05/05 4:42p Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/ioqueue.h>
Index: /pjproject/main/pjlib/src/pj/ioqueue_select.c
===================================================================
--- /pjproject/main/pjlib/src/pj/ioqueue_select.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/ioqueue_select.c	(revision 3)
@@ -1,23 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/ioqueue_select.c 15    10/29/05 10:27p Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/ioqueue_select.c $
- * 
- * 15    10/29/05 10:27p Bennylp
- * Fixed misc warnings.
- * 
- * 14    10/29/05 11:31a Bennylp
- * Changed accept and lock.
- * 
- * 13    10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 12    9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 11    9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
- */
-
+/* $Id$
+ *
+ */
 /*
  * sock_select.c
@@ -499,5 +481,6 @@
 #	        if defined(PJ_WIN32) && PJ_WIN32 != 0
                 rc = pj_sock_recv(h->fd, h->rd_buf, &bytes_read, 0);
-#               elif defined(PJ_LINUX) && PJ_LINUX != 0
+#               elif (defined(PJ_LINUX) && PJ_LINUX != 0) || \
+		     (defined(PJ_SUNOS) && PJ_SUNOS != 0)
                 bytes_read = read(h->fd, h->rd_buf, bytes_read);
                 rc = (bytes_read >= 0) ? PJ_SUCCESS : pj_get_os_error();
@@ -506,5 +489,5 @@
                 rc = (bytes_read >= 0) ? PJ_SUCCESS : -bytes_read;
 #               else
-#               error "Check this man!"
+#               error "Implement read() for this platform!"
 #               endif
             }
@@ -560,10 +543,11 @@
 		  PJ_IOQUEUE_IS_CONNECT_OP(h->op));
 
-#if PJ_HAS_TCP
+#if defined(PJ_HAS_TCP) && PJ_HAS_TCP!=0
 	if ((h->op & PJ_IOQUEUE_OP_CONNECT)) {
 	    /* Completion of connect() operation */
 	    pj_ssize_t bytes_transfered;
 
-#if defined(PJ_LINUX) || defined(PJ_LINUX_KERNEL)
+#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
+    (defined(PJ_LINUX_KERNEL) && PJ_LINUX_KERNEL!=0)
 	    /* from connect(2): 
 		* On Linux, use getsockopt to read the SO_ERROR option at
@@ -585,8 +569,23 @@
                 bytes_transfered = value;
 	    }
-#elif defined(PJ_WIN32)
+#elif defined(PJ_WIN32) && PJ_WIN32!=0
 	    bytes_transfered = 0; /* success */
 #else
-#  error "Got to check this one!"
+	    /* Excellent information in D.J. Bernstein page:
+	     * http://cr.yp.to/docs/connect.html
+	     *
+	     * Seems like the most portable way of detecting connect()
+	     * failure is to call getpeername(). If socket is connected,
+	     * getpeername() will return 0. If the socket is not connected,
+	     * it will return ENOTCONN, and read(fd, &ch, 1) will produce
+	     * the right errno through error slippage. This is a combination
+	     * of suggestions from Douglas C. Schmidt and Ken Keys.
+	     */
+	    int gp_rc;
+	    struct sockaddr_in addr;
+	    socklen_t addrlen = sizeof(addr);
+
+	    gp_rc = getpeername(h->fd, (struct sockaddr*)&addr, &addrlen);
+	    bytes_transfered = gp_rc;
 #endif
 
Index: /pjproject/main/pjlib/src/pj/ioqueue_winnt.c
===================================================================
--- /pjproject/main/pjlib/src/pj/ioqueue_winnt.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/ioqueue_winnt.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/ioqueue_winnt.c 11    10/29/05 11:31a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/ioqueue_winnt.c $
- * 
- * 11    10/29/05 11:31a Bennylp
- * Changed accept and lock.
- * 
- * 10    10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 9     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/ioqueue.h>
Index: /pjproject/main/pjlib/src/pj/list.c
===================================================================
--- /pjproject/main/pjlib/src/pj/list.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/list.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/list.c 5     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/list.c $
- * 
- * 5     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 4     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/list.h>
Index: /pjproject/main/pjlib/src/pj/lock.c
===================================================================
--- /pjproject/main/pjlib/src/pj/lock.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/lock.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/lock.c 3     10/29/05 11:51a Bennylp $ */
-/*
- * $Log: /pjproject-0.3/pjlib/src/pj/lock.c $
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/05/05 6:35p Bennylp
- * Created.
+/* $Id$
+ *
  */
 #include <pj/lock.h>
Index: /pjproject/main/pjlib/src/pj/log.c
===================================================================
--- /pjproject/main/pjlib/src/pj/log.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/log.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/log.c 7     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/log.c $
- * 
- * 7     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 6     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/types.h>
Index: /pjproject/main/pjlib/src/pj/log_writer_printk.c
===================================================================
--- /pjproject/main/pjlib/src/pj/log_writer_printk.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/log_writer_printk.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/log_writer_printk.c 2     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/log_writer_printk.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/22/05 10:37a Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/log.h>
Index: /pjproject/main/pjlib/src/pj/log_writer_stdout.c
===================================================================
--- /pjproject/main/pjlib/src/pj/log_writer_stdout.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/log_writer_stdout.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/log_writer_stdout.c 5     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/log_writer_stdout.c $
- * 
- * 5     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 4     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 3     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/log.h>
Index: /pjproject/main/pjlib/src/pj/md5.c
===================================================================
--- /pjproject/main/pjlib/src/pj/md5.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/md5.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/md5.c 5     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
   Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
@@ -23,5 +25,5 @@
 
  */
-/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
+/* Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp */
 /*
   Independent implementation of MD5 (RFC 1321).
@@ -403,2 +405,3 @@
 	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }
+
Index: /pjproject/main/pjlib/src/pj/os_core_linux_kernel.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_core_linux_kernel.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_core_linux_kernel.c	(revision 3)
@@ -1,14 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_core_linux_kernel.c 3     10/29/05 11:51a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/os_core_linux_kernel.c $
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/22/05 10:38a Bennylp
- * Creaetd.
+/* $Id$
  *
  */
@@ -253,5 +242,5 @@
 
     /* Initialize and set the thread entry. */
-    pj_memset(desc, 0, sizeof(pj_thread_desc));
+    pj_memset(desc, 0, sizeof(struct pj_thread_t));
 
     if(cstr_thread_name && pj_strlen(&thread_name) < sizeof(thread->obj_name)-1)
@@ -288,5 +277,5 @@
 	return rc;
 
-    return pj_thread_register("pjlib-main", (pj_uint8_t*)&main_thread, &dummy);
+    return pj_thread_register("pjlib-main", (long*)&main_thread, &dummy);
 }
 
@@ -473,8 +462,9 @@
 }
 
-PJ_DEF(void) pj_thread_local_set(long index, void *value)
+PJ_DEF(pj_status_t) pj_thread_local_set(long index, void *value)
 {
     pj_assert(index >= 0 && index < MAX_TLS_ID);
     tls_values[index] = value;
+    return PJ_SUCCESS;
 }
 
Index: /pjproject/main/pjlib/src/pj/os_core_unix.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_core_unix.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_core_unix.c	(revision 3)
@@ -1,15 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_core_unix.c 11    10/29/05 10:27p Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/os_core_unix.c $ 
- * 
- * 11    10/29/05 10:27p Bennylp
- * Fixed misc warnings.
- * 
- * 10    10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 9     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
+/* $Id$
  *
  */
@@ -33,4 +21,7 @@
 
 #define __USE_GNU
+//uncomment this to get pthread_mutexattr_settype declaration.
+//unfortunately this causes syntax error in pthread.h! :(
+//#define __USE_UNIX98
 #include <pthread.h>
 
@@ -175,4 +166,5 @@
 #if PJ_HAS_THREADS
     char stack_ptr;
+    pj_status_t rc;
     pj_thread_t *thread = (pj_thread_t *)desc;
     pj_str_t thread_name = pj_str((char*)cstr_thread_name);
@@ -191,5 +183,5 @@
 
     /* Initialize and set the thread entry. */
-    pj_memset(desc, 0, sizeof(pj_thread_desc));
+    pj_memset(desc, 0, sizeof(struct pj_thread_t));
     thread->thread = pthread_self();
 
@@ -199,5 +191,7 @@
 	pj_sprintf(thread->obj_name, "thr%p", (void*)thread->thread);
     
-    pj_thread_local_set(thread_tls_id, thread);
+    rc = pj_thread_local_set(thread_tls_id, thread);
+    if (rc != PJ_SUCCESS)
+	return rc;
 
 #if defined(PJ_OS_HAS_CHECK_STACK) && PJ_OS_HAS_CHECK_STACK!=0
@@ -214,5 +208,5 @@
     pj_thread_t *thread = (pj_thread_t*)desc;
     *ptr_thread = thread;
-    return SUCCESS;
+    return PJ_SUCCESS;
 #endif
 }
@@ -231,5 +225,5 @@
 	return rc;
     }
-    return pj_thread_register("thr%p", (pj_uint8_t*)&main_thread, &dummy);
+    return pj_thread_register("thr%p", (long*)&main_thread, &dummy);
 #else
     PJ_LOG(2,(THIS_FILE, "Thread init error. Threading is not enabled!"));
@@ -248,4 +242,5 @@
     pj_thread_t *rec = param;
     void *result;
+    pj_status_t rc;
 
 #if defined(PJ_OS_HAS_CHECK_STACK) && PJ_OS_HAS_CHECK_STACK!=0
@@ -254,5 +249,8 @@
 
     /* Set current thread id. */
-    pj_thread_local_set(thread_tls_id, rec);
+    rc = pj_thread_local_set(thread_tls_id, rec);
+    if (rc != PJ_SUCCESS) {
+	pj_assert(!"Thread TLS ID is not set (pj_init() error?)");
+    }
 
     /* Check if suspension is required. */
@@ -660,5 +658,5 @@
  * pj_thread_local_set()
  */
-PJ_DEF(void) pj_thread_local_set(long index, void *value)
+PJ_DEF(pj_status_t) pj_thread_local_set(long index, void *value)
 {
     //Can't check stack because this function is called in the
@@ -666,8 +664,10 @@
     //PJ_CHECK_STACK();
 #if PJ_HAS_THREADS
-    pthread_setspecific(index, value);
+    int rc=pthread_setspecific(index, value);
+    return rc==0 ? PJ_SUCCESS : PJ_RETURN_OS_ERROR(rc);
 #else
     pj_assert(index >= 0 && index < MAX_THREADS);
     tls[index] = value;
+    return PJ_SUCCESS;
 #endif
 }
@@ -706,14 +706,32 @@
 {
 #if PJ_HAS_THREADS
-    PJ_UNUSED_ARG(type);
-
-    PJ_CHECK_STACK();
+    pthread_mutexattr_t attr;
+    int rc;
+
+    PJ_CHECK_STACK();
+
+    pthread_mutexattr_init(&attr);
 
     if (type == PJ_MUTEX_SIMPLE) {
-	pthread_mutex_t the_mutex = PTHREAD_MUTEX_INITIALIZER;
-	mutex->mutex = the_mutex;
+#if defined(PJ_LINUX) && PJ_LINUX!=0
+	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP);
+#else
+	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
+#endif
     } else {
-	pthread_mutex_t the_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-	mutex->mutex = the_mutex;
+#if defined(PJ_LINUX) && PJ_LINUX!=0
+	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+#else
+	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+#endif
+    }
+    
+    if (rc != 0) {
+	return PJ_RETURN_OS_ERROR(rc);
+    }
+
+    rc = pthread_mutex_init(&mutex->mutex, &attr);
+    if (rc != 0) {
+	return PJ_RETURN_OS_ERROR(rc);
     }
     
Index: /pjproject/main/pjlib/src/pj/os_core_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_core_win32.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_core_win32.c	(revision 3)
@@ -1,18 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_core_win32.c 12    10/29/05 11:51a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/os_core_win32.c $
- * 
- * 12    10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 11    10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 10    9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 9     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/os.h>
@@ -192,4 +178,5 @@
 {
     char stack_ptr;
+    pj_status_t rc;
     pj_thread_t *thread = (pj_thread_t *)desc;
     pj_str_t thread_name = pj_str((char*)cstr_thread_name);
@@ -208,5 +195,5 @@
 
     /* Initialize and set the thread entry. */
-    pj_memset(desc, 0, sizeof(pj_thread_desc));
+    pj_memset(desc, 0, sizeof(struct pj_thread_t));
     thread->hthread = GetCurrentThread();
     thread->idthread = GetCurrentThreadId();
@@ -225,5 +212,7 @@
 	pj_sprintf(thread->obj_name, "thr%p", (void*)thread->idthread);
     
-    pj_thread_local_set(thread_tls_id, thread);
+    rc = pj_thread_local_set(thread_tls_id, thread);
+    if (rc != PJ_SUCCESS)
+	return rc;
 
     *thread_ptr = thread;
@@ -257,5 +246,8 @@
     PJ_LOG(6,(rec->obj_name, "Thread started"));
 
-    pj_thread_local_set(thread_tls_id, rec);
+    if (pj_thread_local_set(thread_tls_id, rec) != PJ_SUCCESS) {
+	pj_assert(!"TLS is not set (pj_init() error?)");
+    }
+
     result = (*rec->proc)(rec->arg);
 
@@ -586,10 +578,13 @@
  * pj_thread_local_set()
  */
-PJ_DEF(void) pj_thread_local_set(long index, void *value)
-{
+PJ_DEF(pj_status_t) pj_thread_local_set(long index, void *value)
+{
+    BOOL rc;
+
     //Can't check stack because this function is called in the
     //beginning before main thread is initialized.
     //PJ_CHECK_STACK();
-    TlsSetValue(index, value);
+    rc = TlsSetValue(index, value);
+    return rc!=0 ? PJ_SUCCESS : PJ_RETURN_OS_ERROR(GetLastError());
 }
 
Index: /pjproject/main/pjlib/src/pj/os_error_linux_kernel.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_error_linux_kernel.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_error_linux_kernel.c	(revision 3)
@@ -1,11 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_error_linux_kernel.c 2     10/29/05 11:51a Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/os_error_linux_kernel.c $
- * 
- * 2     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 1     10/19/05 1:48p Bennylp
- * Created.
+/* $Id$
  *
  */
Index: /pjproject/main/pjlib/src/pj/os_error_unix.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_error_unix.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_error_unix.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_error_unix.c 1     10/14/05 12:19a Bennylp $ */
+/* $Id$
+ *
+ */
 /* 
  * $Log: /pjproject-0.3/pjlib/src/pj/os_error_unix.c $
Index: /pjproject/main/pjlib/src/pj/os_error_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_error_win32.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_error_win32.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_error_win32.c 3     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/os_error_win32.c $
  * 
Index: /pjproject/main/pjlib/src/pj/os_time_ansi.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_time_ansi.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_time_ansi.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_time_ansi.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/os_time_ansi.c $
  * 
Index: /pjproject/main/pjlib/src/pj/os_time_linux_kernel.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_time_linux_kernel.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_time_linux_kernel.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_time_linux_kernel.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pj/os_time_linux_kernel.c $
  * 
Index: /pjproject/main/pjlib/src/pj/os_timestamp_common.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_timestamp_common.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_timestamp_common.c	(revision 3)
@@ -1,13 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_timestamp_common.c 2     10/14/05 12:26a Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/os_timestamp_common.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/09/05 2:56p Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/os_timestamp_linux.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_timestamp_linux.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_timestamp_linux.c	(revision 3)
@@ -1,17 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_timestamp_linux.c 4     10/29/05 10:27p Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/os_timestamp_linux.c $
- * 
- * 4     10/29/05 10:27p Bennylp
- * Fixed misc warnings.
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 1     9/18/05 9:25p Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/os_timestamp_linux_kernel.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_timestamp_linux_kernel.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_timestamp_linux_kernel.c	(revision 3)
@@ -1,11 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_timestamp_linux_kernel.c 2     10/29/05 11:51a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/os_timestamp_linux_kernel.c $
- * 
- * 2     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 1     9/22/05 10:39a Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/os_timestamp_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/os_timestamp_win32.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/os_timestamp_win32.c	(revision 3)
@@ -1,13 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/os_timestamp_win32.c 2     10/14/05 12:26a Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/os_timestamp_win32.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/18/05 8:15p Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/os.h>
Index: /pjproject/main/pjlib/src/pj/pool.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/pool.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/pool.c 8     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/pool.c $
- * 
- * 8     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 7     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/pool_caching.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool_caching.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/pool_caching.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/pool_caching.c 5     9/17/05 10:37a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/pool_caching.c $
- * 
- * 5     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/pool_dbg_win32.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool_dbg_win32.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/pool_dbg_win32.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/pool_dbg_win32.c 4     9/17/05 10:37a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/pool_dbg_win32.c $
- * 
- * 4     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/pool_policy_kmalloc.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool_policy_kmalloc.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/pool_policy_kmalloc.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/pool_policy_kmalloc.c 3     10/29/05 11:51a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/pool_policy_kmalloc.c $
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/22/05 10:40a Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/pool_policy_malloc.c
===================================================================
--- /pjproject/main/pjlib/src/pj/pool_policy_malloc.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/pool_policy_malloc.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/pool_policy_malloc.c 2     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/pool_policy_malloc.c $
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     9/21/05 1:37p Bennylp
- * Renamed from pool_policy.c
- * 
- * 3     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/pool.h>
Index: /pjproject/main/pjlib/src/pj/rand.c
===================================================================
--- /pjproject/main/pjlib/src/pj/rand.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/rand.c	(revision 3)
@@ -1,14 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/rand.c 3     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/rand.c $
- * 
- * 3     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 2     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
- * 1     9/15/05 8:40p Bennylp
- * Created.
+/* $Id$
+ *
  */
 #include <pj/rand.h>
Index: /pjproject/main/pjlib/src/pj/rbtree.c
===================================================================
--- /pjproject/main/pjlib/src/pj/rbtree.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/rbtree.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/rbtree.c 5     9/17/05 10:37a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/rbtree.c $
- * 
- * 5     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/rbtree.h>
Index: /pjproject/main/pjlib/src/pj/scanner.c
===================================================================
--- /pjproject/main/pjlib/src/pj/scanner.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/scanner.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/scanner.c 9     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/scanner.c $
- * 
- * 9     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 8     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 7     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/scanner.h>
Index: /pjproject/main/pjlib/src/pj/sock_bsd.c
===================================================================
--- /pjproject/main/pjlib/src/pj/sock_bsd.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/sock_bsd.c	(revision 3)
@@ -1,18 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/sock_bsd.c 10    10/29/05 11:51a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/sock_bsd.c $
- * 
- * 10    10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 9     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 8     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 7     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/sock.h>
Index: /pjproject/main/pjlib/src/pj/sock_linux_kernel.c
===================================================================
--- /pjproject/main/pjlib/src/pj/sock_linux_kernel.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/sock_linux_kernel.c	(revision 3)
@@ -1,19 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/sock_linux_kernel.c 4     10/29/05 11:51a Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/sock_linux_kernel.c $
- * 
- * 4     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 3     10/20/05 9:19a Bennylp
- * Updated with new API convention (error code)
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/05/05 4:43p Bennylp
- * Created.
- * 
+/* $Id$
+ *
  */
 #include <pj/sock.h>
Index: /pjproject/main/pjlib/src/pj/sock_select.c
===================================================================
--- /pjproject/main/pjlib/src/pj/sock_select.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/sock_select.c	(revision 3)
@@ -1,17 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/sock_select.c 4     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/sock_select.c $
- * 
- * 4     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 3     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 2     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
- * 1     9/15/05 8:40p Bennylp
- * Created.
+/* $Id$
+ *
  */
 #include <pj/sock_select.h>
@@ -21,4 +8,7 @@
 #include <pj/errno.h>
 
+#if defined(PJ_HAS_STRING_H) && PJ_HAS_STRING_H!=0
+#   include <string.h>
+#endif
 
 #ifdef _MSC_VER
@@ -26,6 +16,7 @@
 #endif
 
-#define PART_FDSET(p_fdsetp)    ((fd_set*)&p_fdsetp->data[1])
-#define PART_COUNT(p_fdsetp)    (p_fdsetp->data[0])
+#define PART_FDSET(ps)		((fd_set*)&ps->data[1])
+#define PART_FDSET_OR_NULL(ps)	(ps ? PART_FDSET(ps) : NULL)
+#define PART_COUNT(ps)		(ps->data[0])
 
 PJ_DEF(void) PJ_FD_ZERO(pj_fd_set_t *fdsetp)
@@ -96,6 +87,6 @@
     }
 
-    return select(n, PART_FDSET(readfds), PART_FDSET(writefds),
-		  PART_FDSET(exceptfds), p_os_timeout);
+    return select(n, PART_FDSET_OR_NULL(readfds), PART_FDSET_OR_NULL(writefds),
+		  PART_FDSET_OR_NULL(exceptfds), p_os_timeout);
 }
 
Index: /pjproject/main/pjlib/src/pj/string.c
===================================================================
--- /pjproject/main/pjlib/src/pj/string.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/string.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/string.c 9     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/string.c $
- * 
- * 9     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 8     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/string.h>
Index: /pjproject/main/pjlib/src/pj/stun.c
===================================================================
--- /pjproject/main/pjlib/src/pj/stun.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/stun.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/stun.c 6     9/17/05 10:37a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/stun.c $
- * 
- * 6     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/stun.h>
Index: /pjproject/main/pjlib/src/pj/stun_client.c
===================================================================
--- /pjproject/main/pjlib/src/pj/stun_client.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/stun_client.c	(revision 3)
@@ -1,12 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/stun_client.c 6     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/stun_client.c $
- * 
- * 6     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 5     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/stun.h>
Index: /pjproject/main/pjlib/src/pj/symbols.c
===================================================================
--- /pjproject/main/pjlib/src/pj/symbols.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/symbols.c	(revision 3)
@@ -1,15 +1,3 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/symbols.c 3     10/29/05 11:51a Bennylp $ */
-/* 
- * $Log: /pjproject-0.3/pjlib/src/pj/symbols.c $ 
- * 
- * 3     10/29/05 11:51a Bennylp
- * Version 0.3-pre2.
- * 
- * 2     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 1     10/05/05 4:43p Bennylp
- * Created.
+/* $Id$
  *
  */
Index: /pjproject/main/pjlib/src/pj/timer.c
===================================================================
--- /pjproject/main/pjlib/src/pj/timer.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/timer.c	(revision 3)
@@ -1,22 +1,12 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/timer.c 8     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* (C)1993-2003 Douglas C. Schmidt
  *
  * This file is originaly from ACE library by Doug Schmidt
- * ACE(TM), TAO(TM) and CIAO(TM) are copyrighted by Douglas C. Schmidt and his research 
- * group at Washington University, University of California, Irvine, and Vanderbilt 
- * University Copyright (c) 1993-2003, all rights reserved.
- */
-/* $Log: /pjproject-0.3/pjlib/src/pj/timer.c $
- * 
- * 8     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 7     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 6     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- *
+ * ACE(TM), TAO(TM) and CIAO(TM) are copyrighted by Douglas C. Schmidt and 
+ * his research group at Washington University, University of California, 
+ * Irvine, and Vanderbilt University Copyright 
+ * (c) 1993-2003, all rights reserved.
  */
 #include <pj/timer.h>
Index: project/main/pjlib/src/pj/tounix
===================================================================
--- /pjproject/main/pjlib/src/pj/tounix	(revision 1)
+++ 	(revision )
@@ -1,4 +1,0 @@
-#!/bin/sh
-cp $1 /tmp
-cat /tmp/$1 | tr -d '\r' > $1
-
Index: /pjproject/main/pjlib/src/pj/types.c
===================================================================
--- /pjproject/main/pjlib/src/pj/types.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/types.c	(revision 3)
@@ -1,8 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/types.c 4     9/17/05 10:37a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/types.c $
- * 
- * 4     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/types.h>
Index: /pjproject/main/pjlib/src/pj/xml.c
===================================================================
--- /pjproject/main/pjlib/src/pj/xml.c	(revision 1)
+++ /pjproject/main/pjlib/src/pj/xml.c	(revision 3)
@@ -1,15 +1,4 @@
-/* $Header: /pjproject-0.3/pjlib/src/pj/xml.c 9     10/14/05 12:26a Bennylp $ */
-/* $Log: /pjproject-0.3/pjlib/src/pj/xml.c $
- * 
- * 9     10/14/05 12:26a Bennylp
- * Finished error code framework, some fixes in ioqueue, etc. Pretty
- * major.
- * 
- * 8     9/21/05 1:39p Bennylp
- * Periodic checkin for backup.
- * 
- * 7     9/17/05 10:37a Bennylp
- * Major reorganization towards version 0.3.
- * 
+/* $Id$
+ *
  */
 #include <pj/xml.h>
Index: /pjproject/main/pjlib/src/pjlib-samples/except.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-samples/except.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-samples/except.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-samples/except.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-samples/except.c $
Index: /pjproject/main/pjlib/src/pjlib-samples/list.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-samples/list.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-samples/list.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-samples/list.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-samples/list.c $
Index: /pjproject/main/pjlib/src/pjlib-samples/log.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-samples/log.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-samples/log.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-samples/log.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-samples/log.c $
Index: /pjproject/main/pjlib/src/pjlib-test/atomic.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/atomic.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/atomic.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/atomic.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/atomic.c $
Index: /pjproject/main/pjlib/src/pjlib-test/echo_clt.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/echo_clt.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/echo_clt.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/echo_clt.c 3     10/29/05 10:25p Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/echo_clt.c $
@@ -47,5 +49,5 @@
     PJ_FD_SET(sock, &fdset);
     
-    return pj_sock_select(1, &fdset, NULL, NULL, &timeout);
+    return pj_sock_select(FD_SETSIZE, &fdset, NULL, NULL, &timeout);
 }
 
@@ -83,4 +85,8 @@
         return -20;
     }
+
+    PJ_LOG(3,("", "...socket connected to %s:%d", 
+		  pj_inet_ntoa(addr.sin_addr),
+		  pj_ntohs(addr.sin_port)));
 
     pj_create_random_string(send_buf, BUF_SIZE);
@@ -116,4 +122,9 @@
         if (rc == 0) {
             PJ_LOG(3,("", "...timeout"));
+	    bytes = 0;
+	} else if (rc < 0) {
+	    rc = pj_get_netos_error();
+	    app_perror("...select() error", rc);
+	    break;
         } else {
             /* Receive back the original packet. */
@@ -130,8 +141,9 @@
                     }
                     bytes = 0;
+		    received = 0;
                     break;
                 }
                 bytes += received;
-            } while (bytes != BUF_SIZE);
+            } while (bytes != BUF_SIZE && bytes != 0);
         }
 
@@ -178,5 +190,5 @@
 
         if (pj_memcmp(send_buf, recv_buf, BUF_SIZE) != 0) {
-            PJ_LOG(3,("", "...error: buffer has changed!"));
+            //PJ_LOG(3,("", "...error: buffer has changed!"));
             break;
         }
Index: /pjproject/main/pjlib/src/pjlib-test/echo_srv.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/echo_srv.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/echo_srv.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/echo_srv.c 3     10/29/05 10:23p Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/echo_srv.c $
Index: /pjproject/main/pjlib/src/pjlib-test/errno.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/errno.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/errno.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/errno.c 4     10/14/05 3:05p Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/errno.c $
Index: /pjproject/main/pjlib/src/pjlib-test/exception.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/exception.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/exception.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/exception.c 2     10/14/05 12:26a Bennylp $
+/* $Id$
+ *
+
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/fifobuf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/fifobuf.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/fifobuf.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/fifobuf.c 2     10/14/05 12:26a Bennylp $
+/* $Id$
+ *
+
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/ioq_perf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/ioq_perf.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/ioq_perf.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/ioq_perf.c 4     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/ioq_perf.c $
Index: /pjproject/main/pjlib/src/pjlib-test/ioq_tcp.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/ioq_tcp.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/ioq_tcp.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/ioq_tcp.c 4     10/29/05 10:23p Bennylp $
+/* $Id$
+ *
+
  */
 /*
Index: /pjproject/main/pjlib/src/pjlib-test/ioq_udp.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/ioq_udp.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/ioq_udp.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/ioq_udp.c 4     10/29/05 10:23p Bennylp $
+/* $Id$
+ *
+
  */
 /*
Index: /pjproject/main/pjlib/src/pjlib-test/list.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/list.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/list.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/list.c 2     10/14/05 12:26a Bennylp $
+/* $Id$
+ *
+
  */
 #include "test.h"
Index: /pjproject/main/pjlib/src/pjlib-test/main.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/main.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/main.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/main.c 4     29/10/05 21:32 Bennylp $
+/* $Id$
+ *
+
  */
 /* 
@@ -36,4 +38,20 @@
 #endif
 
+#if defined(PJ_SUNOS) && PJ_SUNOS!=0
+#include <signal.h>
+static void init_signals()
+{
+    struct sigaction act;
+
+    memset(&act, 0, sizeof(act));
+    act.sa_handler = SIG_IGN;
+
+    sigaction(SIGALRM, &act, NULL);
+}
+
+#else
+#define init_signals()
+#endif
+
 int main(int argc, char *argv[])
 {
@@ -41,4 +59,5 @@
 
     boost();
+    init_signals();
 
     while (argc > 1) {
Index: /pjproject/main/pjlib/src/pjlib-test/main_mod.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/main_mod.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/main_mod.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/main_mod.c 2     10/29/05 11:51a Bennylp $
+/* $Id$
+ *
+
  */
 /* 
Index: /pjproject/main/pjlib/src/pjlib-test/mutex.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/mutex.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/mutex.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/mutex.c 1     10/23/05 12:52p Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/mutex.c $
Index: /pjproject/main/pjlib/src/pjlib-test/os.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/os.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/os.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/os.c 2     10/14/05 12:26a Bennylp $
+/* $Id$
+ *
+
  */
 /*
Index: /pjproject/main/pjlib/src/pjlib-test/pool.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/pool.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/pool.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/pool.c 2     10/14/05 12:26a Bennylp $
+/* $Id$
+ *
+
  */
 /*
Index: /pjproject/main/pjlib/src/pjlib-test/pool_perf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/pool_perf.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/pool_perf.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/pool_perf.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* 
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/pool_perf.c $
Index: /pjproject/main/pjlib/src/pjlib-test/rand.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/rand.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/rand.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/rand.c 1     10/05/05 5:13p Bennylp $ */
+/* $Id$
+ *
+ */
 /* 
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/rand.c $
Index: /pjproject/main/pjlib/src/pjlib-test/rbtree.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/rbtree.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/rbtree.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/rbtree.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 #include "test.h"
 
Index: /pjproject/main/pjlib/src/pjlib-test/select.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/select.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/select.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/select.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/select.c $
Index: /pjproject/main/pjlib/src/pjlib-test/sleep.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/sleep.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/sleep.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/sleep.c 3     10/29/05 11:51a Bennylp $
+/* $Id$
+ *
+
  */
 /*
Index: /pjproject/main/pjlib/src/pjlib-test/sock.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/sock.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/sock.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/sock.c 4     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 /* $Log: /pjproject-0.3/pjlib/src/pjlib-test/sock.c $
  * 
Index: /pjproject/main/pjlib/src/pjlib-test/sock_perf.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/sock_perf.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/sock_perf.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/sock_perf.c 4     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/sock_perf.c $
Index: /pjproject/main/pjlib/src/pjlib-test/string.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/string.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/string.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/string.c 2     10/14/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 /* 
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/string.c $
Index: /pjproject/main/pjlib/src/pjlib-test/test.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/test.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/test.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/test.c 4     29/10/05 21:33 Bennylp $
+/* $Id$
+ *
+
  */
 /* 
Index: /pjproject/main/pjlib/src/pjlib-test/test.h
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/test.h	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/test.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/test.h 4     10/29/05 10:28p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJLIB_TEST_H__
 #define __PJLIB_TEST_H__
@@ -5,9 +7,9 @@
 #include <pj/types.h>
 
-#define GROUP_LIBC                  1
-#define GROUP_OS                    1
-#define GROUP_DATA_STRUCTURE        1
-#define GROUP_NETWORK               1
-#define GROUP_EXTRA                 1
+#define GROUP_LIBC                  0
+#define GROUP_OS                    0
+#define GROUP_DATA_STRUCTURE        0
+#define GROUP_NETWORK               0
+#define GROUP_EXTRA                 0
 
 #define INCLUDE_ERRNO_TEST          GROUP_LIBC
@@ -19,5 +21,5 @@
 #define INCLUDE_POOL_PERF_TEST	    (PJ_HAS_MALLOC && GROUP_LIBC)
 #define INCLUDE_STRING_TEST	    GROUP_DATA_STRUCTURE
-#define INCLUDE_FIFOBUF_TEST	    GROUP_DATA_STRUCTURE
+#define INCLUDE_FIFOBUF_TEST	    0	// GROUP_DATA_STRUCTURE
 #define INCLUDE_RBTREE_TEST	    GROUP_DATA_STRUCTURE
 #define INCLUDE_TIMER_TEST	    GROUP_DATA_STRUCTURE
@@ -36,5 +38,5 @@
 
 #define INCLUDE_ECHO_SERVER         0
-#define INCLUDE_ECHO_CLIENT         0
+#define INCLUDE_ECHO_CLIENT         1
 
 #define ECHO_SERVER_MAX_THREADS     4
@@ -43,5 +45,5 @@
 #define ECHO_SERVER_DURATION_MSEC   (60*60*1000)
 
-#define ECHO_CLIENT_MAX_THREADS     10
+#define ECHO_CLIENT_MAX_THREADS     2
 
 PJ_BEGIN_DECL
Index: /pjproject/main/pjlib/src/pjlib-test/thread.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/thread.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/thread.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/thread.c 4     10/29/05 11:51a Bennylp $
+/* $Id$
+ *
+
  */
 /*
Index: /pjproject/main/pjlib/src/pjlib-test/timer.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/timer.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/timer.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/timer.c 3     10/29/05 10:23p Bennylp $ */
+/* $Id$
+ *
+ */
 #include "test.h"
 
Index: /pjproject/main/pjlib/src/pjlib-test/timestamp.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/timestamp.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/timestamp.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/timestamp.c 4     10/29/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/timestamp.c $
@@ -124,6 +126,9 @@
     /* See if elapsed time is reasonable. */
     if (elapsed < 1 || elapsed > 100000) {
-	PJ_LOG(3,(THIS_FILE, "....error: elapsed time outside window (%u)",
-			     elapsed));
+	PJ_LOG(3,(THIS_FILE, "....error: elapsed time outside window (%u, "
+			     "t1.u32.hi=%u, t1.u32.lo=%u, "
+			     "t2.u32.hi=%u, t2.u32.lo=%u)",
+			     elapsed, 
+			     t1.u32.hi, t1.u32.lo, t2.u32.hi, t2.u32.lo));
 	return -1030;
     }
Index: /pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_sync.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_sync.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/udp_echo_srv_sync.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/udp_echo_srv_sync.c 2     29/10/05 21:34 Bennylp $ */
+/* $Id$
+ *
+ */
 /*
  * $Log: /pjproject-0.3/pjlib/src/pjlib-test/udp_echo_srv_sync.c $
Index: /pjproject/main/pjlib/src/pjlib-test/util.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/util.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/util.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjlib/src/pjlib-test/util.c 3     10/29/05 11:51a Bennylp $
+/* $Id$
+ *
+
  */
 /* 
Index: /pjproject/main/pjlib/src/pjlib-test/xml.c
===================================================================
--- /pjproject/main/pjlib/src/pjlib-test/xml.c	(revision 1)
+++ /pjproject/main/pjlib/src/pjlib-test/xml.c	(revision 3)
Index: /pjproject/main/pjmedia/build/Makefile
===================================================================
--- /pjproject/main/pjmedia/build/Makefile	(revision 1)
+++ /pjproject/main/pjmedia/build/Makefile	(revision 3)
Index: /pjproject/main/pjmedia/build/make-linux-i386.inc
===================================================================
--- /pjproject/main/pjmedia/build/make-linux-i386.inc	(revision 1)
+++ /pjproject/main/pjmedia/build/make-linux-i386.inc	(revision 3)
Index: /pjproject/main/pjmedia/build/make-mingw.inc
===================================================================
--- /pjproject/main/pjmedia/build/make-mingw.inc	(revision 1)
+++ /pjproject/main/pjmedia/build/make-mingw.inc	(revision 3)
Index: /pjproject/main/pjmedia/build/make-rules
===================================================================
--- /pjproject/main/pjmedia/build/make-rules	(revision 1)
+++ /pjproject/main/pjmedia/build/make-rules	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia.h 2     5/15/05 11:51a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJMEDIA_H__
 #define __PJMEDIA_H__
Index: /pjproject/main/pjmedia/src/pjmedia/codec.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/codec.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/codec.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/codec.c 3     4/17/05 11:59a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/codec.h>
 #include <pj/pool.h>
Index: /pjproject/main/pjmedia/src/pjmedia/codec.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/codec.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/codec.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/codec.h 7     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_CODEC_H__
Index: /pjproject/main/pjmedia/src/pjmedia/config.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/config.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/config.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/config.h 3     2/24/05 10:40a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMED_CONFIG_H__
Index: /pjproject/main/pjmedia/src/pjmedia/dsound.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/dsound.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/dsound.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/dsound.c 6     6/14/05 12:54a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifdef _MSC_VER
Index: /pjproject/main/pjmedia/src/pjmedia/g711.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/g711.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/g711.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjmedia/src/pjmedia/g711.c 5     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 /* This file contains file from Sun Microsystems, Inc, with the complete 
  * copyright notice in the second half of this file.
Index: /pjproject/main/pjmedia/src/pjmedia/jbuf.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/jbuf.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/jbuf.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjmedia/src/pjmedia/jbuf.c 8     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjmedia/jbuf.h>
Index: /pjproject/main/pjmedia/src/pjmedia/jbuf.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/jbuf.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/jbuf.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjmedia/src/pjmedia/jbuf.h 7     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_JBUF_H__
Index: /pjproject/main/pjmedia/src/pjmedia/mediamgr.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/mediamgr.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/mediamgr.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/mediamgr.c 8     6/24/05 1:00a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/mediamgr.h>
 #include <pj/sock.h>
Index: /pjproject/main/pjmedia/src/pjmedia/mediamgr.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/mediamgr.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/mediamgr.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/mediamgr.h 7     8/24/05 10:29a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_MEDIAMGR_H__
Index: /pjproject/main/pjmedia/src/pjmedia/nullsound.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/nullsound.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/nullsound.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/nullsound.c 3     6/14/05 12:54a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/sound.h>
 
Index: /pjproject/main/pjmedia/src/pjmedia/pasound.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/pasound.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/pasound.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/pasound.c 3     6/24/05 11:13p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/sound.h>
 #include <pj/string.h>
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/dsound_wrapper.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/dsound_wrapper.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/dsound_wrapper.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/dsound_wrapper.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/dsound_wrapper.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/dsound_wrapper.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_allocation.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_allocation.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_allocation.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_allocation.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_allocation.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_allocation.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_converters.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_converters.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_converters.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_converters.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_converters.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_converters.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_cpuload.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_cpuload.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_cpuload.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_cpuload.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_cpuload.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_cpuload.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_dither.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_dither.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_dither.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_dither.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_dither.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_dither.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_endianness.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_endianness.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_endianness.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_front.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_front.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_front.c	(revision 3)
@@ -34,5 +34,5 @@
 /** @mainpage
 
-PortAudio is an open-source cross-platform C library for audio input
+PortAudio is an open-source cross-platform CË library for audio input
 and output. It is designed to simplify the porting of audio applications
 between various platforms, and also to simplify the development of audio
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_hostapi.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_hostapi.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_hostapi.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_linux_alsa.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_linux_alsa.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_linux_alsa.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_linux_alsa.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_linux_alsa.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_linux_alsa.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_process.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_process.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_process.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_process.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_process.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_process.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_skeleton.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_skeleton.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_skeleton.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_stream.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_stream.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_stream.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_stream.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_stream.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_stream.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_trace.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_trace.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_trace.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_trace.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_trace.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_trace.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_types.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_types.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_types.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_hostapis.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_hostapis.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_hostapis.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_oss.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_util.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_util.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_util.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_util.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_util.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_unix_util.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_util.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_util.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_util.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_ds.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_ds.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_ds.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_hostapis.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_hostapis.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_hostapis.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_util.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_util.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_util.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_wmme.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_wmme.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_wmme.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_wmme.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_wmme.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_win_wmme.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.c	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/pa_x86_plain_converters.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/portaudio/portaudio.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/portaudio/portaudio.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/portaudio/portaudio.h	(revision 3)
Index: /pjproject/main/pjmedia/src/pjmedia/rtcp.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/rtcp.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/rtcp.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/rtcp.c 4     8/24/05 10:30a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjmedia/rtcp.h>
Index: /pjproject/main/pjmedia/src/pjmedia/rtcp.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/rtcp.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/rtcp.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/rtcp.h 5     8/24/05 10:30a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_RTCP_H__
Index: /pjproject/main/pjmedia/src/pjmedia/rtp.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/rtp.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/rtp.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjmedia/src/pjmedia/rtp.c 5     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjmedia/rtp.h>
Index: /pjproject/main/pjmedia/src/pjmedia/rtp.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/rtp.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/rtp.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/rtp.h 6     8/24/05 10:30a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_RTP_H__
Index: /pjproject/main/pjmedia/src/pjmedia/sdp.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/sdp.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/sdp.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/sdp.c 9     6/12/05 11:36a Bennylp $ */
+/* $Id$
+ *
+ */
 
 
Index: /pjproject/main/pjmedia/src/pjmedia/sdp.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/sdp.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/sdp.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/sdp.h 9     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJSDP_SDP_H__
Index: /pjproject/main/pjmedia/src/pjmedia/session.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/session.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/session.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/session.c 10    6/14/05 12:54a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/session.h>
 #include <pj/log.h>
Index: /pjproject/main/pjmedia/src/pjmedia/session.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/session.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/session.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/session.h 8     8/24/05 10:30a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_SESSION_H__
Index: /pjproject/main/pjmedia/src/pjmedia/sound.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/sound.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/sound.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/sound.h 8     8/24/05 10:30a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_SOUND_H__
Index: /pjproject/main/pjmedia/src/pjmedia/stream.c
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/stream.c	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/stream.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/stream.c 14    6/24/05 11:14p Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjmedia/stream.h>
Index: /pjproject/main/pjmedia/src/pjmedia/stream.h
===================================================================
--- /pjproject/main/pjmedia/src/pjmedia/stream.h	(revision 1)
+++ /pjproject/main/pjmedia/src/pjmedia/stream.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/pjmedia/stream.h 6     8/24/05 10:30a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJMEDIA_STREAM_H__
Index: /pjproject/main/pjmedia/src/test/audio_tool.c
===================================================================
--- /pjproject/main/pjmedia/src/test/audio_tool.c	(revision 1)
+++ /pjproject/main/pjmedia/src/test/audio_tool.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/test/audio_tool.c 11    6/24/05 11:17p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia.h>
 #include <pjlib.h>
Index: /pjproject/main/pjmedia/src/test/jbuf_test.c
===================================================================
--- /pjproject/main/pjmedia/src/test/jbuf_test.c	(revision 1)
+++ /pjproject/main/pjmedia/src/test/jbuf_test.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/test/jbuf_test.c 9     6/24/05 11:18p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <stdio.h>
 #include <ctype.h>
Index: /pjproject/main/pjmedia/src/test/main.c
===================================================================
--- /pjproject/main/pjmedia/src/test/main.c	(revision 1)
+++ /pjproject/main/pjmedia/src/test/main.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/test/main.c 9     6/24/05 11:18p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pj/os.h>
 #include <pj/pool.h>
Index: /pjproject/main/pjmedia/src/test/rtp_test.c
===================================================================
--- /pjproject/main/pjmedia/src/test/rtp_test.c	(revision 1)
+++ /pjproject/main/pjmedia/src/test/rtp_test.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/test/rtp_test.c 4     3/12/05 4:21p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/rtp.h>
 #include <stdio.h>
Index: /pjproject/main/pjmedia/src/test/sdptest.c
===================================================================
--- /pjproject/main/pjmedia/src/test/sdptest.c	(revision 1)
+++ /pjproject/main/pjmedia/src/test/sdptest.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/test/sdptest.c 8     6/12/05 11:36a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/sdp.h>
 #include <pj/os.h>
Index: /pjproject/main/pjmedia/src/test/session_test.c
===================================================================
--- /pjproject/main/pjmedia/src/test/session_test.c	(revision 1)
+++ /pjproject/main/pjmedia/src/test/session_test.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjmedia/src/test/session_test.c 8     6/12/05 11:36a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjmedia/mediamgr.h>
 #include <pjmedia/session.h>
Index: /pjproject/main/pjsip/build/Makefile
===================================================================
--- /pjproject/main/pjsip/build/Makefile	(revision 1)
+++ /pjproject/main/pjsip/build/Makefile	(revision 3)
Index: /pjproject/main/pjsip/build/make-linux-i386.inc
===================================================================
--- /pjproject/main/pjsip/build/make-linux-i386.inc	(revision 1)
+++ /pjproject/main/pjsip/build/make-linux-i386.inc	(revision 3)
Index: /pjproject/main/pjsip/build/make-mingw.inc
===================================================================
--- /pjproject/main/pjsip/build/make-mingw.inc	(revision 1)
+++ /pjproject/main/pjsip/build/make-mingw.inc	(revision 3)
Index: /pjproject/main/pjsip/build/make-optimize.inc
===================================================================
--- /pjproject/main/pjsip/build/make-optimize.inc	(revision 1)
+++ /pjproject/main/pjsip/build/make-optimize.inc	(revision 3)
Index: /pjproject/main/pjsip/build/make-rules
===================================================================
--- /pjproject/main/pjsip/build/make-rules	(revision 1)
+++ /pjproject/main/pjsip/build/make-rules	(revision 3)
Index: /pjproject/main/pjsip/src/pjsip/print.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/print.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/print.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/print.h 9     6/22/05 12:27a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_PRINT_H__
 #define __PJSIP_PRINT_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_auth.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_auth.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_auth.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth.c 12    9/11/05 9:08a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_auth.h>
 #include <pjsip/sip_auth_parser.h>	/* just to get pjsip_DIGEST_STR */
Index: /pjproject/main/pjsip/src/pjsip/sip_auth.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_auth.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_auth.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth.h 11    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_SIP_AUTH_H__
 #define __PJSIP_AUTH_SIP_AUTH_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_auth_msg.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_auth_msg.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_auth_msg.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_msg.c 9     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_auth_msg.h>
 #include <pjsip/sip_auth_parser.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_auth_msg.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_auth_msg.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_auth_msg.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_msg.h 7     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_SIP_AUTH_MSG_H__
 #define __PJSIP_AUTH_SIP_AUTH_MSG_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_auth_parser.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_auth_parser.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_auth_parser.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_parser.c 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_auth_parser.h>
 #include <pjsip/sip_auth_msg.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_auth_parser.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_auth_parser.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_auth_parser.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_auth_parser.h 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_SIP_AUTH_PARSER_H__
 #define __PJSIP_AUTH_SIP_AUTH_PARSER_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_config.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_config.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_config.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_config.h 10    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_CONFIG_H__
 #define __PJSIP_SIP_CONFIG_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_endpoint.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_endpoint.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_endpoint.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_endpoint.c 26    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_endpoint.h>
 #include <pjsip/sip_transaction.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_endpoint.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_endpoint.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_endpoint.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_endpoint.h 12    6/22/05 12:27a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_ENDPOINT_H__
 #define __PJSIP_SIP_ENDPOINT_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_event.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_event.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_event.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_event.h 5     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_EVENT_H__
 #define __PJSIP_SIP_EVENT_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_misc.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_misc.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_misc.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_misc.c 15    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_misc.h>
 #include <pjsip/sip_transport.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_misc.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_misc.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_misc.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_misc.h 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_MISC_H__
 #define __PJSIP_SIP_MISC_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_module.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_module.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_module.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_module.h 6     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_MODULE_H__
 #define __PJSIP_SIP_MODULE_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_msg.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_msg.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_msg.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_msg.c 16    6/22/05 12:40a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_msg.h>
 #include <pjsip/print.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_msg.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_msg.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_msg.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_msg.h 13    6/22/05 12:27a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_MSG_H__
 #define __PJSIP_SIP_MSG_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_msg_i.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_msg_i.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_msg_i.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_msg_i.h 2     2/24/05 10:46a Bennylp $ */
+/* $Id$
+ *
+ */
 
 PJ_IDEF(void) pjsip_msg_add_hdr( pjsip_msg *msg, pjsip_hdr *hdr )
Index: /pjproject/main/pjsip/src/pjsip/sip_parser.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_parser.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_parser.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_parser.c 17    9/11/05 9:28a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_parser.h>
 #include <pjsip/sip_uri.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_parser.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_parser.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_parser.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_parser.h 10    9/11/05 9:28a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_PARSER_H__
 #define __PJSIP_SIP_PARSER_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_private.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_private.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_private.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_private.h 5     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_PRIVATE_H__
 #define __PJSIP_SIP_PRIVATE_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_resolve.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_resolve.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_resolve.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_resolve.c 5     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjsip/sip_resolve.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_resolve.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_resolve.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_resolve.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_resolve.h 5     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_RESOLVE_H__
 #define __PJSIP_SIP_RESOLVE_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_transaction.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_transaction.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_transaction.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transaction.c 21    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_transaction.h>
 #include <pjsip/sip_transport.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_transaction.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_transaction.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_transaction.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transaction.h 7     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_TRANSACTION_H__
 #define __PJSIP_SIP_TRANSACTION_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_transport.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_transport.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_transport.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transport.c 18    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_transport.h>
 #include <pjsip/sip_endpoint.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_transport.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_transport.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_transport.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip/sip_transport.h 11    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_TRANSPORT_H__
 #define __PJSIP_SIP_TRANSPORT_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_types.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_types.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_types.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_types.h 5     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_TYPES_H__
 #define __PJSIP_SIP_TYPES_H__
Index: /pjproject/main/pjsip/src/pjsip/sip_uri.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_uri.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_uri.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_uri.c 8     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_uri.h>
 #include <pjsip/sip_msg.h>
Index: /pjproject/main/pjsip/src/pjsip/sip_uri.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip/sip_uri.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip/sip_uri.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip/sip_uri.h 7     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_URI_H__
 #define __PJSIP_SIP_URI_H__
Index: /pjproject/main/pjsip/src/pjsip_auth.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_auth.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_auth.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_auth.h 2     6/05/05 12:13p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_AUTH_H__
 #define __PJSIP_AUTH_H__
Index: /pjproject/main/pjsip/src/pjsip_core.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_core.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_core.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_core.h 2     6/19/05 6:12p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_CORE_H__
 #define __PJSIP_CORE_H__
Index: /pjproject/main/pjsip/src/pjsip_mod_ua/sip_dialog.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_mod_ua/sip_dialog.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_mod_ua/sip_dialog.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip_mod_ua/sip_dialog.c 27    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_mod_ua/sip_dialog.h>
 #include <pjsip_mod_ua/sip_ua.h>
Index: /pjproject/main/pjsip/src/pjsip_mod_ua/sip_dialog.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_mod_ua/sip_dialog.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_mod_ua/sip_dialog.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_dialog.h 13    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_DIALOG_H__
 #define __PJSIP_DIALOG_H__
Index: /pjproject/main/pjsip/src/pjsip_mod_ua/sip_reg.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_mod_ua/sip_reg.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_mod_ua/sip_reg.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_reg.c 14    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_mod_ua/sip_reg.h>
 #include <pjsip/sip_endpoint.h>
Index: /pjproject/main/pjsip/src/pjsip_mod_ua/sip_reg.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_mod_ua/sip_reg.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_mod_ua/sip_reg.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_reg.h 11    8/24/05 10:35a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_REG_H__
 #define __PJSIP_SIP_REG_H__
Index: /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsip_mod_ua/sip_ua.c 16    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_mod_ua/sip_ua.h>
 #include <pjsip_mod_ua/sip_dialog.h>
Index: /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_ua.h 6     6/17/05 11:16p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIP_UA_H__
 #define __PJSIP_SIP_UA_H__
Index: /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua_private.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua_private.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_mod_ua/sip_ua_private.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_mod_ua/sip_ua_private.h 3     3/25/05 12:51p Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJSIP_UA_PRIVATE_H__
Index: /pjproject/main/pjsip/src/pjsip_simple.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple.h 5     6/17/05 12:26a Bennylp $ */
+/* $Id$
+ *
+ */
 
 /**
Index: /pjproject/main/pjsip/src/pjsip_simple/event_notify.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/event_notify.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/event_notify.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify.c 11    8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/event_notify.h>
 #include <pjsip/sip_msg.h>
Index: /pjproject/main/pjsip/src/pjsip_simple/event_notify.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/event_notify.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/event_notify.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify.h 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_EVENT_NOTIFY_H__
 #define __PJSIP_SIMPLE_EVENT_NOTIFY_H__
Index: /pjproject/main/pjsip/src/pjsip_simple/event_notify_msg.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/event_notify_msg.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/event_notify_msg.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify_msg.c 2     6/21/05 12:37a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/event_notify_msg.h>
 #include <pjsip/print.h>
Index: /pjproject/main/pjsip/src/pjsip_simple/event_notify_msg.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/event_notify_msg.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/event_notify_msg.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/event_notify_msg.h 4     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_EVENT_NOTIFY_MSG_H__
 #define __PJSIP_SIMPLE_EVENT_NOTIFY_MSG_H__
Index: /pjproject/main/pjsip/src/pjsip_simple/messaging.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/messaging.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/messaging.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/messaging.c 7     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/messaging.h>
 #include <pjsip/sip_endpoint.h>
Index: /pjproject/main/pjsip/src/pjsip_simple/messaging.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/messaging.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/messaging.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/messaging.h 6     8/31/05 9:05p Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_MESSAGING_H__
 #define __PJSIP_SIMPLE_MESSAGING_H__
Index: /pjproject/main/pjsip/src/pjsip_simple/pidf.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/pidf.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/pidf.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/pidf.c 3     6/21/05 12:37a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/pidf.h>
 #include <pj/string.h>
Index: /pjproject/main/pjsip/src/pjsip_simple/pidf.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/pidf.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/pidf.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/pidf.h 3     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_PIDF_H__
 #define __PJSIP_SIMPLE_PIDF_H__
Index: /pjproject/main/pjsip/src/pjsip_simple/presence.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/presence.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/presence.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/presence.c 7     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/presence.h>
 #include <pjsip/sip_transport.h>
Index: /pjproject/main/pjsip/src/pjsip_simple/presence.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/presence.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/presence.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/presence.h 6     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_PRESENCE_H__
 #define __PJSIP_SIMPLE_PRESENCE_H__
Index: /pjproject/main/pjsip/src/pjsip_simple/xpidf.c
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/xpidf.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/xpidf.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/xpidf.c 3     6/22/05 11:42p Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip_simple/xpidf.h>
 #include <pj/pool.h>
Index: /pjproject/main/pjsip/src/pjsip_simple/xpidf.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_simple/xpidf.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_simple/xpidf.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_simple/xpidf.h 3     8/24/05 10:33a Bennylp $ */
+/* $Id$
+ *
+ */
 #ifndef __PJSIP_SIMPLE_XPIDF_H__
 #define __PJSIP_SIMPLE_XPIDF_H__
Index: /pjproject/main/pjsip/src/pjsip_ua.h
===================================================================
--- /pjproject/main/pjsip/src/pjsip_ua.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsip_ua.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsip_ua.h 1     4/17/05 11:59a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifndef __PJSIP_UA_H__
Index: /pjproject/main/pjsip/src/pjsua/getopt.c
===================================================================
--- /pjproject/main/pjsip/src/pjsua/getopt.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsua/getopt.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsua/getopt.c 4     5/14/05 12:24a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #ifdef _MSC_VER
Index: /pjproject/main/pjsip/src/pjsua/getopt.h
===================================================================
--- /pjproject/main/pjsip/src/pjsua/getopt.h	(revision 1)
+++ /pjproject/main/pjsip/src/pjsua/getopt.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsua/getopt.h 3     5/05/05 11:43p Bennylp $ */
+/* $Id$
+ *
+ */
 /* Declarations for getopt.
    Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
Index: /pjproject/main/pjsip/src/pjsua/main.c
===================================================================
--- /pjproject/main/pjsip/src/pjsua/main.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsua/main.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/pjsua/main.c 40    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 
 #include <pjlib.h>
Index: /pjproject/main/pjsip/src/pjsua/misc.c
===================================================================
--- /pjproject/main/pjsip/src/pjsua/misc.c	(revision 1)
+++ /pjproject/main/pjsip/src/pjsua/misc.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/pjsua/misc.c 21    6/23/05 12:36a Bennylp $ */
+/* $Id$
+ *
+ */
 
 /*
Index: /pjproject/main/pjsip/src/tests/pjsip_core/main.c
===================================================================
--- /pjproject/main/pjsip/src/tests/pjsip_core/main.c	(revision 1)
+++ /pjproject/main/pjsip/src/tests/pjsip_core/main.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/tests/pjsip_core/main.c 2     2/24/05 10:46a Bennylp $ */
+/* $Id$
+ *
+ */
 #include "test.h"
 #include <stdio.h>
Index: /pjproject/main/pjsip/src/tests/pjsip_core/test.h
===================================================================
--- /pjproject/main/pjsip/src/tests/pjsip_core/test.h	(revision 1)
+++ /pjproject/main/pjsip/src/tests/pjsip_core/test.h	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject/pjsip/src/tests/pjsip_core/test.h 2     2/24/05 10:46a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pj/types.h>
 
Index: /pjproject/main/pjsip/src/tests/pjsip_core/test_msg.c
===================================================================
--- /pjproject/main/pjsip/src/tests/pjsip_core/test_msg.c	(revision 1)
+++ /pjproject/main/pjsip/src/tests/pjsip_core/test_msg.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/tests/pjsip_core/test_msg.c 10    10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_msg.h>
 #include <pjsip/sip_parser.h>
Index: /pjproject/main/pjsip/src/tests/pjsip_core/test_uri.c
===================================================================
--- /pjproject/main/pjsip/src/tests/pjsip_core/test_uri.c	(revision 1)
+++ /pjproject/main/pjsip/src/tests/pjsip_core/test_uri.c	(revision 3)
@@ -1,3 +1,5 @@
-/* $Header: /pjproject-0.3/pjsip/src/tests/pjsip_core/test_uri.c 9     10/14/05 12:23a Bennylp $ */
+/* $Id$
+ *
+ */
 #include <pjsip/sip_parser.h>
 #include <pjsip/sip_uri.h>
Index: /pjproject/main/user.mak
===================================================================
--- /pjproject/main/user.mak	(revision 1)
+++ /pjproject/main/user.mak	(revision 3)
