From 3ed7f68d4e55634dac413afa88c043e3660e48d6 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Sat, 2 Jun 2012 14:53:37 +0000 Subject: [PATCH] Rename include/bitchx to include/options.h. This fixes building on case-insensitive filesystems like NTFS or HFS+, where it clashes with the BitchX binary. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@204 13b04d17-f746-0410-82c6-800466cd88b0 --- Changelog | 3 +++ include/{bitchx => options.h} | 2 +- source/Makefile.in | 2 +- source/functions.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) rename include/{bitchx => options.h} (94%) diff --git a/Changelog b/Changelog index 0400d6b..8fcc0dd 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,8 @@ [Changes 1.2c01] +* Rename include/bitchx to include/options.h, fixes building on + case-insensitive platforms. (caf) + * Use AI_ADDRCONFIG flag to improve server address selection when client is built for IPv6 but we don't have an IPv6 address. (caf) diff --git a/include/bitchx b/include/options.h similarity index 94% rename from include/bitchx rename to include/options.h index 167f5e4..4cdf52c 100644 --- a/include/bitchx +++ b/include/options.h @@ -1,5 +1,5 @@ -char compile_time_options[] = { +static const char compile_time_options[] = { 'a', #ifdef NO_BOTS diff --git a/source/Makefile.in b/source/Makefile.in index 64fb518..60f2d47 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -499,7 +499,7 @@ functions.o: functions.c ../include/irc.h ../include/defs.h \ ../include/gui.h ../include/gtkbitchx.h ../include/translat.h \ ../include/notify.h ../include/misc.h ../include/userlist.h \ ../include/numbers.h ../include/hash2.h ../include/whowas.h \ - ../include/log.h ../include/bitchx ../include/tcl_bx.h + ../include/log.h ../include/options.h ../include/tcl_bx.h funny.o: funny.c ../include/irc.h ../include/defs.h \ ../include/config.h ../include/../.config.h ../include/color.h \ ../include/bsdglob.h ../include/irc_std.h ../include/debug.h \ diff --git a/source/functions.c b/source/functions.c index 2c022ff..f438b86 100644 --- a/source/functions.c +++ b/source/functions.c @@ -46,7 +46,7 @@ CVS_REVISION(functions_c) #define MAIN_SOURCE #include "modval.h" -#include "bitchx" +#include "options.h" #include #ifdef HAVE_REGEX_H