summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am2
-rw-r--r--src/conf.c (renamed from src/conffile.c)2
-rw-r--r--src/conf.h (renamed from src/conffile.h)6
-rw-r--r--src/main.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 05b5bb6..b306c8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ tinyproxy_SOURCES = \
buffer.c buffer.h \
child.c child.h \
common.h \
- conffile.c conffile.h \
+ conf.c conf.h \
conns.c conns.h \
daemon.c daemon.h \
hashmap.c hashmap.h \
diff --git a/src/conffile.c b/src/conf.c
index 5e9d766..f6d44b8 100644
--- a/src/conffile.c
+++ b/src/conf.c
@@ -24,7 +24,7 @@
#include "main.h"
-#include "conffile.h"
+#include "conf.h"
#include "acl.h"
#include "anonymous.h"
diff --git a/src/conffile.h b/src/conf.h
index 3c1b94b..9c3036a 100644
--- a/src/conffile.h
+++ b/src/conf.h
@@ -16,10 +16,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* See 'conffile.c' for detailed information. */
+/* See 'conf.c' for detailed information. */
-#ifndef TINYPROXY_CONFFILE_H
-#define TINYPROXY_CONFFILE_H
+#ifndef TINYPROXY_CONF_H
+#define TINYPROXY_CONF_H
extern int config_compile (void);
extern int config_parse (struct config_s *conf, FILE * f);
diff --git a/src/main.c b/src/main.c
index 8f2c185..608e707 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,7 +30,7 @@
#include "anonymous.h"
#include "buffer.h"
-#include "conffile.h"
+#include "conf.h"
#include "daemon.h"
#include "heap.h"
#include "filter.h"