Merge branch 'stable' into tunnel
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 3 Feb 2010 11:37:37 +0000 (12:37 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 3 Feb 2010 11:37:37 +0000 (12:37 +0100)
1  2 
src/main.c

diff --cc src/main.c
@@@ -90,12 -89,8 +90,12 @@@ static void olsr_shutdown(int) __attrib
   */
  void olsr_reconfigure(int) __attribute__ ((noreturn));
  
- static void print_usage(void);
+ static void print_usage(bool error);
  
 +#ifdef linux
 +static const char* ipip_default_name = "olsr_tunnel";
 +#endif
 +
  static int set_default_ifcnfs(struct olsr_if *, struct if_config_options *);
  
  static int olsr_process_arguments(int, char *[], struct olsrd_config *,