More missing IPv6 definitions and autoconf checks to make sure it compiles

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index ef1ee50..75d7ebe 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: conf.c,v 1.9.4.62 2003/07/06 22:11:31 guus Exp $
+    $Id: conf.c,v 1.9.4.64 2003/07/11 16:12:59 guus Exp $
 */
 
 #include "config.h"
@@ -51,7 +51,7 @@ int pingtimeout = 0;                  /* seconds before timeout */
 char *confbase = NULL;                 /* directory in which all config files are */
 char *netname = NULL;                  /* name of the vpn network */
 
-int config_compare(config_t *a, config_t *b)
+static int config_compare(config_t *a, config_t *b)
 {
        int result;
 
@@ -270,7 +270,7 @@ int get_config_subnet(config_t *cfg, subnet_t ** result)
   given, and buf needs to be expanded, the var pointed to by buflen
   will be increased.
 */
-char *readline(FILE * fp, char **buf, size_t *buflen)
+static char *readline(FILE * fp, char **buf, size_t *buflen)
 {
        char *newline = NULL;
        char *p;
@@ -429,16 +429,6 @@ int read_server_config()
        return x;
 }
 
-int isadir(const char *f)
-{
-       struct stat s;
-
-       if(stat(f, &s) < 0)
-               return 0;
-       else
-               return S_ISDIR(s.st_mode);
-}
-
 int is_safe_path(const char *file)
 {
        char *p;