From cd283c8825c9a94400f27735acb1c9385e90ffc8 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 19 Jul 2011 03:42:28 +0000 Subject: Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn". git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/build/pjlib++-test.dsp | 102 ------ pjlib/build/pjlib++.dsp | 146 --------- pjlib/build/pjlib.dsp | 639 -------------------------------------- pjlib/build/pjlib.dsw | 89 ------ pjlib/build/pjlib_samples.dsp | 113 ------- pjlib/build/pjlib_test.dsp | 244 --------------- pjlib/include/pj/compat/cc_gcc.h | 3 + pjlib/include/pj/compat/cc_msvc.h | 3 + pjlib/include/pj/config.h | 11 +- pjlib/include/pj/errno.h | 2 + pjlib/include/pj/os.h | 30 ++ pjlib/src/pj/errno.c | 4 +- pjlib/src/pj/os_core_darwin.m | 86 +++++ pjlib/src/pj/os_core_symbian.cpp | 9 + pjlib/src/pj/os_core_unix.c | 8 + pjlib/src/pj/os_core_win32.c | 9 + 16 files changed, 160 insertions(+), 1338 deletions(-) delete mode 100644 pjlib/build/pjlib++-test.dsp delete mode 100644 pjlib/build/pjlib++.dsp delete mode 100644 pjlib/build/pjlib.dsp delete mode 100644 pjlib/build/pjlib.dsw delete mode 100644 pjlib/build/pjlib_samples.dsp delete mode 100644 pjlib/build/pjlib_test.dsp create mode 100644 pjlib/src/pj/os_core_darwin.m (limited to 'pjlib') diff --git a/pjlib/build/pjlib++-test.dsp b/pjlib/build/pjlib++-test.dsp deleted file mode 100644 index 88ae04a1..00000000 --- a/pjlib/build/pjlib++-test.dsp +++ /dev/null @@ -1,102 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjlib++_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=pjlib++_test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjlib++-test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjlib++-test.mak" CFG="pjlib++_test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjlib++_test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pjlib++_test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjlib++_test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "./output/pjlib++-test-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "./output/pjlib++-test-i386-win32-vc6-release" -# PROP Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../pjlib-util/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D PJ_WIN32=1 /D PJ_M_I386=1 /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../bin/pjlib++-test-i386-win32-vc6-release.exe" - -!ELSEIF "$(CFG)" == "pjlib++_test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "./output/pjlib++-test-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "./output/pjlib++-test-i386-win32-vc6-debug" -# PROP Intermediate_Dir "./output/pjlib++-test-i386-win32-vc6-debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib-util/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjlib++-test-i386-win32-vc6-debug.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pjlib++_test - Win32 Release" -# Name "pjlib++_test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\pjlib++-test\main.cpp" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/pjlib/build/pjlib++.dsp b/pjlib/build/pjlib++.dsp deleted file mode 100644 index 9b83235b..00000000 --- a/pjlib/build/pjlib++.dsp +++ /dev/null @@ -1,146 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjlib++" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjlib++ - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjlib++.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjlib++.mak" CFG="pjlib++ - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjlib++ - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjlib++ - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjlib++ - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjlib++-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjlib++-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../../pjlib-util/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjlib++-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjlib++ - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjlib++-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjlib++-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjlib++-i386-win32-vc6-debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib-util/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjlib++-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjlib++ - Win32 Release" -# Name "pjlib++ - Win32 Debug" -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\include\pj++\file.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\hash.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\list.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\lock.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\os.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pjlib++.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\pool.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\proactor.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\scanner.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\sock.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\string.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\timer.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\tree.hpp" -# End Source File -# Begin Source File - -SOURCE="..\include\pj++\types.hpp" -# End Source File -# End Group -# End Target -# End Project diff --git a/pjlib/build/pjlib.dsp b/pjlib/build/pjlib.dsp deleted file mode 100644 index d63165eb..00000000 --- a/pjlib/build/pjlib.dsp +++ /dev/null @@ -1,639 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjlib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=pjlib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjlib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjlib.mak" CFG="pjlib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjlib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "pjlib - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjlib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjlib-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjlib-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjlib-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjlib-i386-win32-vc6-release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PJ_WIN32" /D "PJ_M_I386" /FR /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjlib-i386-win32-vc6-release.lib" - -!ELSEIF "$(CFG)" == "pjlib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjlib-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjlib-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjlib-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjlib-i386-win32-vc6-debug" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PJ_WIN32" /D "PJ_M_I386" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"../lib/pjlib-i386-win32-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "pjlib - Win32 Release" -# Name "pjlib - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "Other Targets" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\src\pj\addr_resolv_linux_kernel.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\guid_simple.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ioqueue_dummy.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ioqueue_epoll.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ip_helper_generic.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\log_writer_printk.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_core_linux_kernel.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_core_unix.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_error_linux_kernel.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_error_unix.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_time_linux_kernel.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_timestamp_linux.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_timestamp_linux_kernel.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\pool_policy_kmalloc.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\sock_linux_kernel.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\symbols.c -# PROP Exclude_From_Build 1 -# End Source File -# End Group -# Begin Source File - -SOURCE=..\src\pj\activesock.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\addr_resolv_sock.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\array.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\config.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ctype.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\errno.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\except.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\fifobuf.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\file_access_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\file_io_ansi.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\file_io_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\guid.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\guid_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\hash.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ioqueue_common_abs.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ioqueue_common_abs.h -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ioqueue_select.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ioqueue_winnt.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ip_helper_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\list.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\lock.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\log.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\log_writer_stdout.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_core_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_error_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_time_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_timestamp_common.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\os_timestamp_win32.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\pool.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\pool_buf.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\pool_caching.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\pool_dbg.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\pool_policy_malloc.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\rand.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\rbtree.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\sock_bsd.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\sock_common.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\sock_qos_bsd.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\sock_qos_common.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\sock_select.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ssl_sock_common.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ssl_sock_dump.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\ssl_sock_ossl.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\string.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\timer.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\types.c -# End Source File -# Begin Source File - -SOURCE=..\src\pj\unicode_win32.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "compat" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pj\compat\assert.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\cc_gcc.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\cc_msvc.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\ctype.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\errno.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\high_precision.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\m_alpha.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\m_i386.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\m_m68k.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\m_sparc.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\malloc.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\os_linux.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\os_linux_kernel.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\os_palmos.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\os_sunos.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\os_win32.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\rand.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\setjmp.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\size_t.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\socket.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\stdarg.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\stdfileio.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\string.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\time.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\compat\vsprintf.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\include\pj\activesock.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\addr_resolv.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\array.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\assert.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\config.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\config_site.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\config_site_sample.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\ctype.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\doxygen.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\errno.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\except.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\fifobuf.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\file_access.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\file_io.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\guid.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\hash.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\ioqueue.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\ip_helper.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\list.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\lock.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\log.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\math.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\os.h -# End Source File -# Begin Source File - -SOURCE=..\include\pjlib.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\pool.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\pool_alt.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\pool_buf.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\rand.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\rbtree.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\sock.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\sock_qos.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\sock_select.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\ssl_sock.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\string.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\timer.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\types.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\unicode.h -# End Source File -# End Group -# Begin Group "Inline Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\include\pj\list_i.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\pool_i.h -# End Source File -# Begin Source File - -SOURCE=..\include\pj\string_i.h -# End Source File -# End Group -# End Target -# End Project diff --git a/pjlib/build/pjlib.dsw b/pjlib/build/pjlib.dsw deleted file mode 100644 index aa45adf6..00000000 --- a/pjlib/build/pjlib.dsw +++ /dev/null @@ -1,89 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "pjlib"=.\pjlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjlib++"=".\pjlib++.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pjlib++_test"=".\pjlib++-test.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib++ - End Project Dependency -}}} - -############################################################################### - -Project: "pjlib_samples"=.\pjlib_samples.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency -}}} - -############################################################################### - -Project: "pjlib_test"=.\pjlib_test.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/pjlib/build/pjlib_samples.dsp b/pjlib/build/pjlib_samples.dsp deleted file mode 100644 index 40bc3179..00000000 --- a/pjlib/build/pjlib_samples.dsp +++ /dev/null @@ -1,113 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjlib_samples" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) External Target" 0x0106 - -CFG=pjlib_samples - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjlib_samples.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjlib_samples.mak" CFG="pjlib_samples - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjlib_samples - Win32 Release" (based on "Win32 (x86) External Target") -!MESSAGE "pjlib_samples - Win32 Debug" (based on "Win32 (x86) External Target") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" - -!IF "$(CFG)" == "pjlib_samples - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "./output/pjlib-samples-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir "./output/pjlib-samples-i386-win32-vc6-release" -# PROP BASE Cmd_Line "NMAKE /f pjlib_samples.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "pjlib_samples.exe" -# PROP BASE Bsc_Name "pjlib_samples.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "./output/pjlib-samples-i386-win32-vc6-release" -# PROP Intermediate_Dir "./output/pjlib-samples-i386-win32-vc6-release" -# PROP Cmd_Line "nmake /f "pjlib_samples.mak" MODE=release" -# PROP Rebuild_Opt "/a" -# PROP Target_File "pjlib samples" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "pjlib_samples - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "./output/pjlib-samples-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir "./output/pjlib-samples-i386-win32-vc6-debug" -# PROP BASE Cmd_Line "NMAKE /f pjlib_samples.mak" -# PROP BASE Rebuild_Opt "/a" -# PROP BASE Target_File "pjlib_samples.exe" -# PROP BASE Bsc_Name "pjlib_samples.bsc" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "./output/pjlib-samples-i386-win32-vc6-debug" -# PROP Intermediate_Dir "./output/pjlib-samples-i386-win32-vc6-debug" -# PROP Cmd_Line "nmake /nologo /f "pjlib_samples.mak" MODE=debug" -# PROP Rebuild_Opt "/a" -# PROP Target_File "pjlib samples" -# PROP Bsc_Name "" -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "pjlib_samples - Win32 Release" -# Name "pjlib_samples - Win32 Debug" - -!IF "$(CFG)" == "pjlib_samples - Win32 Release" - -!ELSEIF "$(CFG)" == "pjlib_samples - Win32 Debug" - -!ENDIF - -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\pjlib-samples\except.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-samples\list.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-samples\log.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=.\pjlib_samples.mak -# End Source File -# End Target -# End Project diff --git a/pjlib/build/pjlib_test.dsp b/pjlib/build/pjlib_test.dsp deleted file mode 100644 index 067dea1d..00000000 --- a/pjlib/build/pjlib_test.dsp +++ /dev/null @@ -1,244 +0,0 @@ -# Microsoft Developer Studio Project File - Name="pjlib_test" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=pjlib_test - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "pjlib_test.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "pjlib_test.mak" CFG="pjlib_test - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "pjlib_test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pjlib_test - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "pjlib_test - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\output\pjlib-test-i386-win32-vc6-release" -# PROP BASE Intermediate_Dir ".\output\pjlib-test-i386-win32-vc6-release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\output\pjlib-test-i386-win32-vc6-release" -# PROP Intermediate_Dir ".\output\pjlib-test-i386-win32-vc6-release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PJ_WIN32" /D "PJ_M_I386" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /debug /machine:I386 /out:"../bin/pjlib-test-i386-win32-vc6-release.exe" - -!ELSEIF "$(CFG)" == "pjlib_test - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\output\pjlib-test-i386-win32-vc6-debug" -# PROP BASE Intermediate_Dir ".\output\pjlib-test-i386-win32-vc6-debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\output\pjlib-test-i386-win32-vc6-debug" -# PROP Intermediate_Dir ".\output\pjlib-test-i386-win32-vc6-debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PJ_WIN32" /D "PJ_M_I386" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libeay32MT.lib ssleay32MT.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjlib-test-i386-win32-vc6-debug.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "pjlib_test - Win32 Release" -# Name "pjlib_test - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\src\pjlib-test\activesock.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\atomic.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\echo_clt.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\errno.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\exception.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\fifobuf.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\file.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\hash_test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\ioq_perf.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\ioq_tcp.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\ioq_udp.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\ioq_unreg.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\list.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\main.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\main_mod.c" -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\main_win32.c" -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\mutex.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\os.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\pool.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\pool_perf.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\rand.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\rbtree.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\select.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\sleep.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\sock.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\sock_perf.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\ssl_sock.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\string.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\test.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\thread.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\timer.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\timestamp.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\udp_echo_srv_ioqueue.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\udp_echo_srv_sync.c" -# End Source File -# Begin Source File - -SOURCE="..\src\pjlib-test\util.c" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\src\pjlib-test\test.h" -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/pjlib/include/pj/compat/cc_gcc.h b/pjlib/include/pj/compat/cc_gcc.h index d176a319..77d93f32 100644 --- a/pjlib/include/pj/compat/cc_gcc.h +++ b/pjlib/include/pj/compat/cc_gcc.h @@ -71,5 +71,8 @@ #define PJ_UNREACHED(x) +#define PJ_ALIGN_DATA(declaration, alignment) declaration __attribute__((aligned (alignment))) + + #endif /* __PJ_COMPAT_CC_GCC_H__ */ diff --git a/pjlib/include/pj/compat/cc_msvc.h b/pjlib/include/pj/compat/cc_msvc.h index 10d0a32b..0b1fd68a 100644 --- a/pjlib/include/pj/compat/cc_msvc.h +++ b/pjlib/include/pj/compat/cc_msvc.h @@ -80,5 +80,8 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_UNREACHED(x) +#define PJ_ALIGN_DATA(declaration, alignment) __declspec(align(alignment)) declaration + + #endif /* __PJ_COMPAT_CC_MSVC_H__ */ diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index 25758452..ec7c7449 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -20,7 +20,6 @@ #ifndef __PJ_CONFIG_H__ #define __PJ_CONFIG_H__ -#error "For PJSIP version 1.x, please switch your svn repository URL to https://svn.pjsip.org/repos/pjproject/branches/1.x" /** * @file config.h @@ -46,6 +45,10 @@ # error "Unknown compiler." #endif +/* PJ_ALIGN_DATA is compiler specific directive to align data address */ +#ifndef PJ_ALIGN_DATA +# error "PJ_ALIGN_DATA is not defined!" +#endif /******************************************************************** * Include target OS specific configuration. @@ -1122,10 +1125,10 @@ PJ_BEGIN_DECL /** PJLIB version major number. */ -#define PJ_VERSION_NUM_MAJOR 1 +#define PJ_VERSION_NUM_MAJOR 2 /** PJLIB version minor number. */ -#define PJ_VERSION_NUM_MINOR 10 +#define PJ_VERSION_NUM_MINOR 0 /** PJLIB version revision number. */ #define PJ_VERSION_NUM_REV 0 @@ -1134,7 +1137,7 @@ PJ_BEGIN_DECL * Extra suffix for the version (e.g. "-trunk"), or empty for * web release version. */ -#define PJ_VERSION_NUM_EXTRA "-svn" +#define PJ_VERSION_NUM_EXTRA "-pre-alpha-svn" /** * PJLIB version number consists of three bytes with the following format: diff --git a/pjlib/include/pj/errno.h b/pjlib/include/pj/errno.h index 49fd7bbd..66fea949 100644 --- a/pjlib/include/pj/errno.h +++ b/pjlib/include/pj/errno.h @@ -468,6 +468,8 @@ PJ_DECL(pj_status_t) pj_register_strerror(pj_status_t start_code, * - PJLIB_UTIL_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*3) * - PJNATH_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*4) * - PJMEDIA_AUDIODEV_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*5) + * - PJ_SSL_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*6) + * - PJMEDIA_VIDEODEV_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*7) */ /* Internal */ diff --git a/pjlib/include/pj/os.h b/pjlib/include/pj/os.h index 45f9ce8f..3ce877af 100644 --- a/pjlib/include/pj/os.h +++ b/pjlib/include/pj/os.h @@ -1432,6 +1432,36 @@ PJ_DECL(pj_uint32_t) pj_elapsed_cycle( const pj_timestamp *start, /** @} */ +/* **************************************************************************/ +/** + * @defgroup PJ_APP_OS Application execution + * @ingroup PJ_OS + * @{ + */ + +/* Type for main function. */ +typedef int (*pj_main_func_ptr)(int argc, char *argv[]); + +/** + * Run the application. This function has to be called in the main thread + * and after doing the necessary initialization according to the flags + * provided, it will call main_func() function. + * + * @param main_func Application's main function. + * @param argc Number of arguments from the main() function, which + * will be passed to main_func() function. + * @param argv The arguments from the main() function, which will + * be passed to main_func() function. + * @param flags Flags for application execution, currently must be 0. + * + * @return main_func()'s return value. + */ +int pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[], + unsigned flags); + +/** @} */ + + /* **************************************************************************/ /** * Internal PJLIB function to initialize the threading subsystem. diff --git a/pjlib/src/pj/errno.c b/pjlib/src/pj/errno.c index ed09f266..615d1450 100644 --- a/pjlib/src/pj/errno.c +++ b/pjlib/src/pj/errno.c @@ -33,7 +33,9 @@ PJ_BEGIN_DECL char *buf, pj_size_t bufsize ); PJ_END_DECL -#define PJLIB_MAX_ERR_MSG_HANDLER 8 +#ifndef PJLIB_MAX_ERR_MSG_HANDLER +# define PJLIB_MAX_ERR_MSG_HANDLER 10 +#endif /* Error message handler. */ static unsigned err_msg_hnd_cnt; diff --git a/pjlib/src/pj/os_core_darwin.m b/pjlib/src/pj/os_core_darwin.m new file mode 100644 index 00000000..686d64be --- /dev/null +++ b/pjlib/src/pj/os_core_darwin.m @@ -0,0 +1,86 @@ +/* $Id$ */ +/* + * Copyright (C) 2011-2011 Teluu Inc. (http://www.teluu.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include +#include +#include +#include +#include + +#define THIS_FILE "os_core_darwin.m" + +typedef struct run_app_t { + pj_main_func_ptr main_func; + int argc; + char **argv; + int retval; +} run_app_t; + +@interface DeadThread: NSObject { ;; } ++ (void)enterMultiThreadedMode; ++ (void)emptyThreadMethod:(id)obj; +@end + +@implementation DeadThread ++ (void)enterMultiThreadedMode +{ + [NSThread detachNewThreadSelector:@selector(emptyThreadMethod:) + toTarget:[DeadThread class] withObject:nil]; +} + ++ (void)emptyThreadMethod:(id)obj { ; } +@end + +static void* main_thread(void *data) +{ + run_app_t *param = (run_app_t *)data; + + param->retval = (*param->main_func)(param->argc, param->argv); + CFRunLoopStop(CFRunLoopGetMain()); + + return NULL; +} + +/* + * pj_run_app() + * This function has to be called from the main thread. The purpose of + * this function is to initialize the application's memory pool, event + * loop management, and multi-threading environment. + */ +PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[], + unsigned flags) +{ + pthread_t thread; + run_app_t param; + NSAutoreleasePool *pool; + + pool = [[NSAutoreleasePool alloc] init]; + [NSApplication sharedApplication]; + [DeadThread enterMultiThreadedMode]; + + param.argc = argc; + param.argv = (char **)argv; + param.main_func = main_func; + if (pthread_create(&thread, NULL, &main_thread, ¶m) == 0) { + CFRunLoopRun(); + } + + PJ_UNUSED_ARG(pool); + + return param.retval; +} diff --git a/pjlib/src/pj/os_core_symbian.cpp b/pjlib/src/pj/os_core_symbian.cpp index abf01b85..5446df5d 100644 --- a/pjlib/src/pj/os_core_symbian.cpp +++ b/pjlib/src/pj/os_core_symbian.cpp @@ -1036,3 +1036,12 @@ PJ_DEF(pj_status_t) pj_thread_get_stack_info(pj_thread_t *thread, } #endif /* PJ_OS_HAS_CHECK_STACK */ + +/* + * pj_run_app() + */ +PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[], + unsigned flags) +{ + return (*main_func)(argc, argv); +} diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c index 3fcfa565..fb0ba09e 100644 --- a/pjlib/src/pj/os_core_unix.c +++ b/pjlib/src/pj/os_core_unix.c @@ -1819,3 +1819,11 @@ PJ_DEF(pj_color_t) pj_term_get_color(void) #endif /* PJ_TERM_HAS_COLOR */ +/* + * pj_run_app() + */ +PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[], + unsigned flags) +{ + return (*main_func)(argc, argv); +} diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c index 2b7c2c91..2b703e74 100644 --- a/pjlib/src/pj/os_core_win32.c +++ b/pjlib/src/pj/os_core_win32.c @@ -1421,3 +1421,12 @@ PJ_DEF(pj_color_t) pj_term_get_color(void) } #endif /* PJ_TERM_HAS_COLOR */ + +/* + * pj_run_app() + */ +PJ_DEF(int) pj_run_app(pj_main_func_ptr main_func, int argc, char *argv[], + unsigned flags) +{ + return (*main_func)(argc, argv); +} -- cgit v1.2.3