[cvslog] (2003-01-23 02:41:58 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Wed Jan 22 20:42:01 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-01-23 02:41:58 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/eggdrop.h src/main.c src/patch.h src/tclmisc.c
     src/mod/filesys.mod/filedb3.h src/mod/seen.mod/seen.c
     src/mod/wire.mod/wire.c

Log message:

* Fixed a few header problems related to time.h. Patch by Tothwolf.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.448 eggdrop1.6/doc/UPDATES1.6:1.449
--- eggdrop1.6/doc/UPDATES1.6:1.448	Wed Jan 22 20:13:28 2003
+++ eggdrop1.6/doc/UPDATES1.6	Wed Jan 22 20:41:48 2003
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.448 2003/01/23 02:13:28 wcc Exp $
+$Id: UPDATES1.6,v 1.449 2003/01/23 02:41:48 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.14
 Found by  Fixed by  What...
+          Tothwolf  fixed a few header problems with time.h
           Wcc       cleaned up transfer.mod a bit
           M. Koszik several misc code cleanups and bugfixes
           Wcc       files copied to /tmp from file transfers are now deleted
Index: eggdrop1.6/src/eggdrop.h
diff -u eggdrop1.6/src/eggdrop.h:1.41 eggdrop1.6/src/eggdrop.h:1.42
--- eggdrop1.6/src/eggdrop.h:1.41	Mon Dec 23 20:30:04 2002
+++ eggdrop1.6/src/eggdrop.h	Wed Jan 22 20:41:48 2003
@@ -4,7 +4,7 @@
  *
  *   IF YOU ALTER THIS FILE, YOU NEED TO RECOMPILE THE BOT.
  *
- * $Id: eggdrop.h,v 1.41 2002/12/24 02:30:04 wcc Exp $
+ * $Id: eggdrop.h,v 1.42 2003/01/23 02:41:48 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -139,15 +139,15 @@
 #endif
 
 /* Almost every module needs some sort of time thingy, so... */
-#if TIME_WITH_SYS_TIME
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
+# else
 #  include <time.h>
-#else
-#  if HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#  else
-#    include <time.h>
-#  endif
+# endif
 #endif
 
 #if !HAVE_SRANDOM
Index: eggdrop1.6/src/main.c
diff -u eggdrop1.6/src/main.c:1.91 eggdrop1.6/src/main.c:1.92
--- eggdrop1.6/src/main.c:1.91	Mon Jan 20 18:53:27 2003
+++ eggdrop1.6/src/main.c	Wed Jan 22 20:41:48 2003
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.91 2003/01/21 00:53:27 wcc Exp $
+ * $Id: main.c,v 1.92 2003/01/23 02:41:48 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -33,7 +33,16 @@
 
 #include "main.h"
 #include <fcntl.h>
-#include <time.h>
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 #include <errno.h>
 #include <signal.h>
 #include <netdb.h>
Index: eggdrop1.6/src/mod/filesys.mod/filedb3.h
diff -u eggdrop1.6/src/mod/filesys.mod/filedb3.h:1.12 eggdrop1.6/src/mod/filesys.mod/filedb3.h:1.13
--- eggdrop1.6/src/mod/filesys.mod/filedb3.h:1.12	Mon Dec 23 20:30:07 2002
+++ eggdrop1.6/src/mod/filesys.mod/filedb3.h	Wed Jan 22 20:41:48 2003
@@ -4,7 +4,7 @@
  *
  * Written by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: filedb3.h,v 1.12 2002/12/24 02:30:07 wcc Exp $
+ * $Id: filedb3.h,v 1.13 2003/01/23 02:41:48 wcc Exp $
  */
 /*
  * Copyright (C) 1999, 2000, 2001, 2002, 2003 Eggheads Development Team
@@ -27,7 +27,24 @@
 #ifndef _EGG_MOD_FILESYS_FILEDB3_H
 #define _EGG_MOD_FILESYS_FILEDB3_H
 
-#include <time.h>	/* for time_t */
+/*
+ * FIXME: These really should be in the .c files that include this header
+ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* for time_t */
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 
 /* Top of each DB */
 typedef struct {
Index: eggdrop1.6/src/mod/seen.mod/seen.c
diff -u eggdrop1.6/src/mod/seen.mod/seen.c:1.27 eggdrop1.6/src/mod/seen.mod/seen.c:1.28
--- eggdrop1.6/src/mod/seen.mod/seen.c:1.27	Mon Dec 23 20:30:08 2002
+++ eggdrop1.6/src/mod/seen.mod/seen.c	Wed Jan 22 20:41:48 2003
@@ -10,7 +10,7 @@
  * 1.2     1997-08-20      Minor fixes. [BB]
  * 1.2a    1997-08-24      Minor fixes. [BB]
  *
- * $Id: seen.c,v 1.27 2002/12/24 02:30:08 wcc Exp $
+ * $Id: seen.c,v 1.28 2003/01/23 02:41:48 wcc Exp $
  */
 /*
  * Copyright (C) 1999, 2000, 2001, 2002, 2003 Eggheads Development Team
@@ -73,7 +73,20 @@
 #define MODULE_NAME "seen"
 #define MAKING_SEEN
 
-#include <time.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 
 #include "src/mod/module.h"
 #include "src/users.h"
Index: eggdrop1.6/src/mod/wire.mod/wire.c
diff -u eggdrop1.6/src/mod/wire.mod/wire.c:1.24 eggdrop1.6/src/mod/wire.mod/wire.c:1.25
--- eggdrop1.6/src/mod/wire.mod/wire.c:1.24	Mon Jan 20 18:53:27 2003
+++ eggdrop1.6/src/mod/wire.mod/wire.c	Wed Jan 22 20:41:48 2003
@@ -15,7 +15,7 @@
  * 1.4       1997-11-25      1.2.2.0         Added language addition  Kirk
  * 1.5       1998-07-12      1.3.0.0         Fixed ;me and updated    BB
  *
- * $Id: wire.c,v 1.24 2003/01/21 00:53:27 wcc Exp $
+ * $Id: wire.c,v 1.25 2003/01/23 02:41:48 wcc Exp $
  */
 /*
  * Copyright (C) 1999, 2000, 2001, 2002, 2003 Eggheads Development Team
@@ -37,10 +37,25 @@
 
 #define MODULE_NAME "wire"
 #define MAKING_WIRE
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include "src/mod/module.h"
 #include "src/users.h"
 #include "src/chan.h"
-#include <time.h>
 #include "wire.h"
 
 #undef global
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.878 eggdrop1.6/src/patch.h:1.879
--- eggdrop1.6/src/patch.h:1.878	Wed Jan 22 20:13:29 2003
+++ eggdrop1.6/src/patch.h	Wed Jan 22 20:41:48 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.878 2003/01/23 02:13:29 wcc Exp $
+ * $Id: patch.h,v 1.879 2003/01/23 02:41:48 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1043287858");		/* current unixtime */
+patch("1043289141");		/* current unixtime */
 /*
  *
  *
  */
-patch("transfer-cleanups");
+patch("header-fixes");
 /*
  *
  *
Index: eggdrop1.6/src/tclmisc.c
diff -u eggdrop1.6/src/tclmisc.c:1.34 eggdrop1.6/src/tclmisc.c:1.35
--- eggdrop1.6/src/tclmisc.c:1.34	Fri Jan 17 18:40:05 2003
+++ eggdrop1.6/src/tclmisc.c	Wed Jan 22 20:41:48 2003
@@ -2,7 +2,7 @@
  * tclmisc.c -- handles:
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.34 2003/01/18 00:40:05 wcc Exp $
+ * $Id: tclmisc.c,v 1.35 2003/01/23 02:41:48 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -23,12 +23,21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <sys/stat.h>
-#include <time.h>
 #include "main.h"
 #include "modules.h"
 #include "tandem.h"
 #include "md5/md5.h"
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+#include <sys/stat.h>
 #ifdef HAVE_UNAME
 #include <sys/utsname.h>
 #endif
----------------------- End of diff -----------------------



More information about the Changes mailing list