From: Andre <maan@p133.(none)>
Date: Tue, 21 Feb 2006 08:20:30 +0000 (+0100)
Subject: Merge branch 'ipc'
X-Git-Tag: v0.2.11~68
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=730cb7dd464355316ee30846a3d2e91f22b4f7e1;p=paraslash.git

Merge branch 'ipc'

Conflicts:

	configure.ac
	error.h

Fix these conflicts.
---

730cb7dd464355316ee30846a3d2e91f22b4f7e1
diff --cc configure.ac
index 4f75f3ab,5e11767e..0e93aa21
--- a/configure.ac
+++ b/configure.ac
@@@ -73,7 -73,7 +73,7 @@@ audiod_ldflags="
  
  server_cmdline_objs="server.cmdline"
  server_errlist_objs="server mp3 afs command net string signal random_dbtool time daemon stat
- 	crypt http_send db close_on_fork plm_dbtool"
 -	crypt http_send db close_on_fork ipc"
++	crypt http_send db close_on_fork plm_dbtool ipc"
  server_ldflags=""
  
  ########################################################################### ssl
diff --cc error.h
index a3755cef,7532509a..0c4a05f4
--- a/error.h
+++ b/error.h
@@@ -23,8 -23,8 +23,8 @@@ enum para_subsystem {SS_RECV
  	SS_NET, SS_ORTP_RECV, SS_AUDIOD, SS_EXEC, SS_CLOSE_ON_FORK, SS_SIGNAL,
  	SS_STRING, SS_DAEMON, SS_STAT, SS_TIME, SS_GRAB_CLIENT, SS_HTTP_RECV,
  	SS_RECV_COMMON, SS_FILTER_CHAIN, SS_WAV, SS_COMPRESS, SS_OGGDEC, SS_FILTER,
 -	SS_COMMAND, SS_RANDOM_DBTOOL, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
 +	SS_COMMAND, SS_RANDOM_DBTOOL, SS_PLM_DBTOOL, SS_CRYPT, SS_HTTP_SEND, SS_ORTP_SEND, SS_DB, SS_OGG,
- 	SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_RINGBUFFER};
+ 	SS_MP3, SS_MP3DEC, SS_SERVER, SS_AFS, SS_MYSQL, SS_IPC, SS_RINGBUFFER};
  #define NUM_SS (SS_RINGBUFFER + 1)
  extern const char **para_errlist[];
  /** \endcond */
@@@ -224,9 -224,13 +224,17 @@@
  	PARA_ERROR(LOCK, "lock error"), \
  	PARA_ERROR(SENDER_CMD, "command not supported by this sender"), \
  
 +#define PLM_DBTOOL_ERRORS \
 +	PARA_ERROR(LOAD_PLAYLIST, "failed to load playlist"), \
 +
++
+ #define IPC_ERRORS \
+ 	PARA_ERROR(SEM_GET, "failed to create semaphore"), \
+ 	PARA_ERROR(SEM_REMOVE, "can not remove semaphore"), \
+ 	PARA_ERROR(SHM_GET, "failed to allocate shared memory area"), \
+ 	PARA_ERROR(SHM_DESTROY, "failed to destroy shared memory area"), \
+ 	PARA_ERROR(SHM_DETACH, "can not detach shared memory area"), \
+ 
  /* these do not need error handling (yet) */
  #define SERVER_ERRORS
  #define WAV_ERRORS