[Olsr-cvs] olsrd-current/src main.c, 1.84, 1.85 scheduler.c, 1.34, 1.35 defs.c, 1.2, NONE

[Andreas T�nnesen]

Update of /cvsroot/olsrd/olsrd-current/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7755

Modified Files:
	main.c scheduler.c 
Removed Files:
	defs.c 
Log Message:
Removed defs.c. Declarations moved to scheduler and main

Index: scheduler.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/scheduler.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** scheduler.c	7 Jan 2006 08:16:20 -0000	1.34
--- scheduler.c	7 Jan 2006 17:18:32 -0000	1.35
***************
*** 58,61 ****
--- 58,66 ----
  #endif
  
+ /* Timer data, global. Externed in defs.h */
+ clock_t now_times;              /* current idea of times(2) reported uptime */
+ struct timeval now;		/* current idea of time */
+ struct tm *nowtm;		/* current idea of time (in tm) */
+ 
  static float pollrate;
  

--- defs.c DELETED ---

Index: main.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/main.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** main.c	7 Jan 2006 08:16:20 -0000	1.84
--- main.c	7 Jan 2006 17:18:32 -0000	1.85
***************
*** 57,60 ****
--- 57,64 ----
  #include "build_msg.h"
  
+ /* Global stuff externed in defs.h */
+ FILE *debug_handle;             /* Where to send debug(defaults to stdout) */
+ struct olsrd_config *olsr_cnf;  /* The global configuration */
+ 
  #ifdef WIN32
  #define close(x) closesocket(x)
***************
*** 90,93 ****
--- 94,98 ----
  static char copyright_string[] = "The olsr.org Optimized Link-State Routing daemon(olsrd) Copyright (c) 2004, Andreas Tønnesen((spam-protected)) All rights reserved.";
  
+ 
  /**
   * Main entrypoint