[pulseaudio-commits] r1841 - in /branches/lennart/src: Makefile.am daemon/main.c pulsecore/once-posix.c pulsecore/once-win32.c pulsecore/once.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Mon Sep 17 15:50:13 2007
New Revision: 1841

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1841&root=pulseaudio&view=rev
Log:
once.c is no longer POSIX specific. Since it is now considerably more advanced than it used to be, use it on windows, too

Added:
    branches/lennart/src/pulsecore/once.c
      - copied unchanged from r1837, branches/lennart/src/pulsecore/once-posix.c
Removed:
    branches/lennart/src/pulsecore/once-posix.c
    branches/lennart/src/pulsecore/once-win32.c
Modified:
    branches/lennart/src/Makefile.am
    branches/lennart/src/daemon/main.c

Modified: branches/lennart/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.am?rev=1841&root=pulseaudio&r1=1840&r2=1841&view=diff
==============================================================================
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Mon Sep 17 15:50:13 2007
@@ -77,15 +77,11 @@
 
 if OS_IS_WIN32
 PA_THREAD_OBJS = \
-		pulsecore/once-win32.c pulsecore/once.h \
 		pulsecore/mutex-win32.c pulsecore/mutex.h \
 		pulsecore/thread-win32.c pulsecore/thread.h \
-		pulsecore/semaphore.h
-#pulsecore/semaphore-win32.c pulsecore/semaphore.h
+		pulsecore/semaphore-win32.c pulsecore/semaphore.h
 else
 PA_THREAD_OBJS = \
-		pulsecore/atomic.h \
-		pulsecore/once-posix.c pulsecore/once.h \
 		pulsecore/mutex-posix.c pulsecore/mutex.h \
 		pulsecore/thread-posix.c pulsecore/thread.h \
 		pulsecore/semaphore-posix.c pulsecore/semaphore.h
@@ -496,6 +492,7 @@
 		pulsecore/flist.c pulsecore/flist.h \
 		pulsecore/object.c pulsecore/object.h \
 		pulsecore/msgobject.c pulsecore/msgobject.h \
+		pulsecore/once.c pulsecore/once.h \
 		$(PA_THREAD_OBJS)
 
 if OS_IS_WIN32
@@ -706,6 +703,7 @@
 		pulsecore/rtpoll.c pulsecore/rtpoll.h \
 		pulsecore/rtclock.c pulsecore/rtclock.h \
 		pulsecore/macro.h \
+		pulsecore/once.c pulsecore/once.h \
 		$(PA_THREAD_OBJS)
 
 if OS_IS_WIN32

Modified: branches/lennart/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/main.c?rev=1841&root=pulseaudio&r1=1840&r2=1841&view=diff
==============================================================================
--- branches/lennart/src/daemon/main.c (original)
+++ branches/lennart/src/daemon/main.c Mon Sep 17 15:50:13 2007
@@ -320,7 +320,6 @@
     int daemon_pipe[2] = { -1, -1 };
     int suid_root, real_root;
     int valid_pid_file = 0;
-
     gid_t gid = (gid_t) -1;
 
 #ifdef OS_IS_WIN32