X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.h;h=b133d82eb66f3b72c8090eda2641611369a85300;hb=8221397af24a2df3c2edbc889847ce0ab15eb3e0;hp=c1e670adcf3f237799dca8f85891a92bb48c3e1c;hpb=9d9ef4f91346188baaef1656b861151ea23437d9;p=paraslash.git

diff --git a/server.h b/server.h
index c1e670ad..b133d82e 100644
--- a/server.h
+++ b/server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -92,8 +92,8 @@ struct misc_meta_data {
 	unsigned int num_connects;
 	/** The number of connections currently active. */
 	unsigned int active_connections;
-	/** The process id of para_server. */
-	pid_t server_pid;
+	/** The process id of the audio file selector. */
+	pid_t afs_pid;
 	/** This gets updated by afs and contains its current mode. */
 	char afs_mode_string[MAXLINE];
 	/** Used by the sender command. */
@@ -106,5 +106,4 @@ struct misc_meta_data {
 extern struct server_args_info conf;
 
 __noreturn void handle_connect(int fd, const char *peername);
-void mmd_unlock(void);
-void mmd_lock(void);
+void parse_config_or_die(int override);