Permalink
Browse files

Rename config.[ch] to configuration.[ch].

The old name conflicts with autoconf-generated files.
  • Loading branch information...
1 parent 17a68a4 commit 68e133a0d367c03b8cd158ea02857d3094810698 @jech committed Jul 18, 2011
Showing with 9 additions and 9 deletions.
  1. +2 −2 Makefile
  2. +1 −1 babeld.c
  3. +1 −1 config.c → configuration.c
  4. 0 config.h → configuration.h
  5. +1 −1 message.c
  6. +1 −1 network.c
  7. +1 −1 resend.c
  8. +1 −1 route.c
  9. +1 −1 xroute.c
View
@@ -9,10 +9,10 @@ CFLAGS = $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
LDLIBS = -lrt
SRCS = babeld.c net.c kernel.c util.c network.c source.c neighbour.c \
- route.c xroute.c message.c resend.c config.c local.c
+ route.c xroute.c message.c resend.c configuration.c local.c
OBJS = babeld.o net.o kernel.o util.o network.o source.o neighbour.o \
- route.o xroute.o message.o resend.o config.o local.o
+ route.o xroute.o message.o resend.o configuration.o local.o
babeld: $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -o babeld $(OBJS) $(LDLIBS)
View
@@ -50,7 +50,7 @@ THE SOFTWARE.
#include "xroute.h"
#include "message.h"
#include "resend.h"
-#include "config.h"
+#include "configuration.h"
#include "local.h"
struct timeval now;
@@ -35,7 +35,7 @@ THE SOFTWARE.
#include "babeld.h"
#include "util.h"
#include "network.h"
-#include "config.h"
+#include "configuration.h"
struct filter *input_filters = NULL;
struct filter *output_filters = NULL;
File renamed without changes.
View
@@ -38,7 +38,7 @@ THE SOFTWARE.
#include "xroute.h"
#include "resend.h"
#include "message.h"
-#include "config.h"
+#include "configuration.h"
#include "kernel.h"
unsigned char packet_header[4] = {42, 2};
View
@@ -38,7 +38,7 @@ THE SOFTWARE.
#include "neighbour.h"
#include "message.h"
#include "route.h"
-#include "config.h"
+#include "configuration.h"
struct network *networks = NULL;
View
@@ -31,7 +31,7 @@ THE SOFTWARE.
#include "resend.h"
#include "message.h"
#include "network.h"
-#include "config.h"
+#include "configuration.h"
struct timeval resend_time = {0, 0};
struct resend *to_resend = NULL;
View
@@ -37,7 +37,7 @@ THE SOFTWARE.
#include "xroute.h"
#include "message.h"
#include "resend.h"
-#include "config.h"
+#include "configuration.h"
#include "local.h"
struct route *routes = NULL;
View
@@ -35,7 +35,7 @@ THE SOFTWARE.
#include "route.h"
#include "xroute.h"
#include "util.h"
-#include "config.h"
+#include "configuration.h"
#include "network.h"
#include "local.h"

0 comments on commit 68e133a

Please sign in to comment.