code cleaning

diff --git a/Makefile.in b/Makefile.in
index 29d9b946e3c9db06d5f840dd34c087c7fb5ce4b9..a616626d2e0da46dcfe01a6c304f92e367baa8d4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 
 # @configure_input@
 
-# $Id: Makefile.in,v 1.75 2001-07-09 13:07:58 thib Exp $
+# $Id: Makefile.in,v 1.76 2001-09-12 13:47:56 thib Exp $
 
 # The following should not be edited manually (use configure options)
 # If you must do it, BEWARE : some of the following is also defined
@@ -62,7 +62,7 @@ OBJSIG = fcronsighup.o subs.o log.o allow.o
 HEADERSALL = config.h $(SRCDIR)/global.h $(SRCDIR)/log.h $(SRCDIR)/subs.h $(SRCDIR)/save.h $(SRCDIR)/option.h 
 HEADERSD = $(HEADERSALL) $(SRCDIR)/fcron.h $(SRCDIR)/getloadavg.h $(SRCDIR)/database.h $(SRCDIR)/conf.h $(SRCDIR)/job.h
 HEADERS = $(HEADERSALL) $(SRCDIR)/fcrontab.h $(SRCDIR)/allow.h $(SRCDIR)/fileconf.h
-HEADERSCONV = $(HEADERSALL) $(SRCDIR)/convert-fcrontab.h
+HEADERSCONV = $(HEADERSALL)
 HEADERSSIG = $(HEADERSALL) $(SRCDIR)/allow.h
 
 # this is two regular expressions

diff --git a/conf.c b/conf.c
index 17b9778270d23a3e71c764329501d780dc925f7f..d0e18f9bec7c5eb7f3a712e0d542324f4af0dc99 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -22,10 +22,12 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: conf.c,v 1.50 2001-08-20 10:58:13 thib Exp $ */
+ /* $Id: conf.c,v 1.51 2001-09-12 13:45:54 thib Exp $ */
 
 #include "fcron.h"
+
 #include "conf.h"
+#include "database.h"
 
 int read_file(const char *file_name, CF *cf);
 int add_line_to_file(CL *cl, CF *cf, uid_t runas, char *runas_str,

diff --git a/conf.h b/conf.h
index 6c88e3b57c27235fe92208d58be8948d741e561d..d75f115b1d10b136b105b3eafbf1f7a72db12271 100644 (file)
--- a/conf.h
+++ b/conf.h
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: conf.h,v 1.2 2001-05-15 00:46:11 thib Exp $ */
+ /* $Id: conf.h,v 1.3 2001-09-12 13:46:04 thib Exp $ */
 
 #ifndef __CONF_H__
 #define __CONF_H__
@@ -30,6 +30,6 @@
 extern void reload_all(const char *dir_name);
 extern void synchronize_dir(const char *dir_name);
 extern void delete_file(const char *user_name);
-extern void save_file(CF *file_name);
+extern void save_file(struct CF *file_name);
 
 #endif /* __CONF_H__ */

diff --git a/fcron.h b/fcron.h
index 6c67b692aff04017c2866fb2b86923fb6462f81d..e3122e040c6f5d8dca0578bef347d1df41861f99 100644 (file)
--- a/fcron.h
+++ b/fcron.h
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: fcron.h,v 1.23 2001-05-29 19:27:55 thib Exp $ */
+ /* $Id: fcron.h,v 1.24 2001-09-12 13:44:58 thib Exp $ */
 
 #ifndef __FCRON_H__
 #define __FCRON_H__
@@ -63,7 +63,7 @@ extern pid_t daemon_pid;
 extern mode_t saved_umask;
 extern char *prog_name;
 extern char sig_hup;
-extern CF *file_base;
+extern struct CF *file_base;
 extern struct job *queue_base;
 extern struct CL **serial_array;
 extern short int serial_array_size;
@@ -86,9 +86,5 @@ extern short int lavg_serial_running;
 /* fcron.c */
 extern void xexit(int exit_value);
 
-#include "database.h"
-#include "conf.h"
-#include "job.h"
-
 #endif /* __FCRON_H */
 

diff --git a/getloadavg.c b/getloadavg.c
index 24bf56ada4e5cb681308b0e6ccb8db517dc6780c..3b6b5682ff02c99bf7cb204e6897600e4d5cf8ae 100644 (file)
--- a/getloadavg.c
+++ b/getloadavg.c
@@ -18,10 +18,11 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "fcron.h"
-
+#ifndef _POSIX_SOURCE  /* Don't redefine is already exists */
 #define _POSIX_SOURCE 1
+#endif
 
+#include "fcron.h"
 
 /* Local headers */