diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-03-30 16:32:18 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-03-30 16:32:18 +0000 |
| commit | 974fbe67d6d62efadd129cc81b9072faf3b2f029 (patch) | |
| tree | 82a44cd7c10d447766280047e035928166833348 /pjlib/build | |
| parent | 3cf609b42e573adf8e7183070176a450a7b4959e (diff) | |
Fixed race condition bug in ioqueue unregistration for select and Win32 IOCP backend
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@365 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/build')
| -rw-r--r-- | pjlib/build/Makefile | 4 | ||||
| -rw-r--r-- | pjlib/build/pjlib.dsp | 13 | ||||
| -rw-r--r-- | pjlib/build/pjlib_test.dsp | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 0faadc15..6192ca0a 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -23,7 +23,7 @@ export PJLIB_SRCDIR = ../src/pj export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ array.o config.o ctype.o errno.o except.o fifobuf.o guid.o \ hash.o list.o lock.o log.o os_time_common.o \ - pool.o pool_caching.o rand.o \ + pool.o pool_caching.o pool_dbg.o rand.o \ rbtree.o string.o timer.o \ types.o symbols.o export PJLIB_CFLAGS += $(_CFLAGS) @@ -34,7 +34,7 @@ export PJLIB_CFLAGS += $(_CFLAGS) export TEST_SRCDIR = ../src/pjlib-test export TEST_OBJS += atomic.o echo_clt.o errno.o exception.o \ fifobuf.o file.o \ - ioq_perf.o ioq_udp.o ioq_tcp.o \ + ioq_perf.o ioq_udp.o ioq_unreg.o ioq_tcp.o \ list.o mutex.o os.o pool.o pool_perf.o rand.o rbtree.o \ select.o sleep.o sock.o sock_perf.o \ string.o test.o thread.o timer.o timestamp.o \ diff --git a/pjlib/build/pjlib.dsp b/pjlib/build/pjlib.dsp index 7aa56669..62abfa9c 100644 --- a/pjlib/build/pjlib.dsp +++ b/pjlib/build/pjlib.dsp @@ -233,6 +233,13 @@ SOURCE=..\src\pj\ioqueue_common_abs.h # Begin Source File
SOURCE=..\src\pj\ioqueue_select.c
+
+!IF "$(CFG)" == "pjlib - Win32 Release"
+
+!ELSEIF "$(CFG)" == "pjlib - Win32 Debug"
+
+!ENDIF
+
# End Source File
# Begin Source File
@@ -285,7 +292,7 @@ SOURCE=..\src\pj\pool_caching.c # End Source File
# Begin Source File
-SOURCE=..\src\pj\pool_dbg_win32.c
+SOURCE=..\src\pj\pool_dbg.c
# End Source File
# Begin Source File
@@ -525,6 +532,10 @@ 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\rand.h
# End Source File
# Begin Source File
diff --git a/pjlib/build/pjlib_test.dsp b/pjlib/build/pjlib_test.dsp index 15bf0d2c..a9c41753 100644 --- a/pjlib/build/pjlib_test.dsp +++ b/pjlib/build/pjlib_test.dsp @@ -123,6 +123,10 @@ 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
|