- definition of CONFIG_FILE and MOTD_FILE is now compatible with -Wtraditional.

This commit is contained in:
Alexander Barton 2002-12-26 13:17:56 +00:00
parent 9353a4a9cb
commit 3c738ed46d
3 changed files with 10 additions and 12 deletions

View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: conf.c,v 1.47 2002/12/18 02:53:36 alex Exp $";
static char UNUSED id[] = "$Id: conf.c,v 1.48 2002/12/26 13:17:56 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -178,7 +178,8 @@ Set_Defaults( VOID )
strcpy( Conf_ServerAdmin2, "" );
strcpy( Conf_ServerAdminMail, "" );
strcpy( Conf_MotdFile, MOTD_FILE );
strcpy( Conf_MotdFile, SYSCONFDIR );
strcat( Conf_MotdFile, MOTD_FILE );
Conf_ListenPorts_Count = 0;

View File

@ -8,7 +8,7 @@
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
*
* $Id: defines.h,v 1.40 2002/12/16 23:10:56 alex Exp $
* $Id: defines.h,v 1.41 2002/12/26 13:17:56 alex Exp $
*
* Global defines of ngIRCd.
*/
@ -83,13 +83,9 @@
#define DEFAULT_AWAY_MSG "Away" /* Away-Meldung fuer User von anderen Servern */
#ifdef PROTOTYPES
# define CONFIG_FILE SYSCONFDIR"/ngircd.conf"
# define MOTD_FILE SYSCONFDIR"/ngircd.motd"
#else
# define CONFIG_FILE "ngircd.conf"
# define MOTD_FILE "ngircd.motd"
#endif
#define CONFIG_FILE "/ngircd.conf"
#define MOTD_FILE "/ngircd.motd"
#define ERROR_DIR "/tmp"
#define MAX_LOG_MSG_LEN 256 /* max. Laenge einer Log-Meldung */

View File

@ -14,7 +14,7 @@
#include "portab.h"
static char UNUSED id[] = "$Id: ngircd.c,v 1.65 2002/12/19 04:29:59 alex Exp $";
static char UNUSED id[] = "$Id: ngircd.c,v 1.66 2002/12/26 13:17:57 alex Exp $";
#include "imp.h"
#include <assert.h>
@ -73,7 +73,8 @@ main( int argc, const char *argv[] )
#ifdef SNIFFER
NGIRCd_Sniffer = FALSE;
#endif
strcpy( NGIRCd_ConfFile, CONFIG_FILE );
strcpy( NGIRCd_ConfFile, SYSCONFDIR );
strcat( NGIRCd_ConfFile, CONFIG_FILE );
/* Kommandozeile parsen */
for( i = 1; i < argc; i++ )