--- rrdtool-1.0.45/contrib/trytime/trytime.c	Tue Feb 26 05:21:19 2002
+++ rrdtool-1.0.45-new/contrib/trytime/trytime.c	Sat Sep  6 16:58:03 2003
@@ -27,7 +27,7 @@
   time_t start_tmp, end_tmp, Now = time(NULL);
   char tim_b[200];
   
-  struct time_value start_tv, end_tv;
+  struct rrd_time_value start_tv, end_tv;
   char *parsetime_error = NULL;
   
   /* default values */
--- rrdtool-1.0.45/src/Makefile.in	Mon Jul 21 14:28:06 2003
+++ rrdtool-1.0.45-new/src/Makefile.in	Sat Sep  6 15:38:06 2003
@@ -124,7 +124,7 @@
 librrd_private_la_SOURCES = $(RRD_C_FILES)
 
 librrd_la_LIBADD = $(RRD_LIBS)
-librrd_la_LDFLAGS = -version-info 0:0:0
+librrd_la_LDFLAGS = -version-info 1:45
 
 include_HEADERS = rrd.h
 
--- rrdtool-1.0.45/src/parsetime.c	Mon Jul 21 14:24:54 2003
+++ rrdtool-1.0.45-new/src/parsetime.c	Sat Sep  6 16:58:21 2003
@@ -472,7 +472,7 @@
  *              It allso applies those m-guessing euristics.
  */
 static char *
-plus_minus(struct time_value *ptv, int doop)
+plus_minus(struct rrd_time_value *ptv, int doop)
 {
     static int op = PLUS;
     static int prev_multiplier = -1;
@@ -552,7 +552,7 @@
  * tod() computes the time of day (TIME-OF-DAY-SPEC)
  */
 static char *
-tod(struct time_value *ptv)
+tod(struct rrd_time_value *ptv)
 {
     int hour, minute = 0;
     int tlen;
@@ -628,7 +628,7 @@
  * assign_date() assigns a date, adjusting year as appropriate
  */
 static char *
-assign_date(struct time_value *ptv, long mday, long mon, long year)
+assign_date(struct rrd_time_value *ptv, long mday, long mon, long year)
 {
     if (year > 138) {
 	if (year > 1970)
@@ -656,7 +656,7 @@
  * day() picks apart DAY-SPEC-[12]
  */
 static char *
-day(struct time_value *ptv)
+day(struct rrd_time_value *ptv)
 {
     long mday=0, wday, mon, year = ptv->tm.tm_year;
     int tlen;
@@ -773,7 +773,7 @@
 
 /*
  * parsetime() is the external interface that takes tspec, parses
- * it and puts the result in the time_value structure *ptv.
+ * it and puts the result in the rrd_time_value structure *ptv.
  * It can return either absolute times (these are ensured to be
  * correct) or relative time references that are expected to be
  * added to some absolute time value and then normalized by
@@ -781,7 +781,7 @@
  * the pointer to the error message in the case of problems
  */
 char *
-parsetime(char *tspec, struct time_value *ptv)
+parsetime(char *tspec, struct rrd_time_value *ptv)
 {
     time_t now = time(NULL);
     int hr = 0;
@@ -908,8 +908,8 @@
 } /* parsetime */
 
 
-int proc_start_end (struct time_value *start_tv, 
-		    struct time_value *end_tv, 
+int proc_start_end (struct rrd_time_value *start_tv, 
+		    struct rrd_time_value *end_tv, 
 		    time_t *start, 
 		    time_t *end){
     if (start_tv->type == RELATIVE_TO_END_TIME  && /* same as the line above */
--- rrdtool-1.0.45/src/rrd.h	Mon Jul 21 14:24:54 2003
+++ rrdtool-1.0.45-new/src/rrd.h	Sat Sep  6 16:57:07 2003
@@ -47,16 +47,16 @@
 
 #define TIME_OK NULL
 
-struct time_value {
+struct rrd_time_value {
   timetype type;
   long offset;
   struct tm tm;
 };
 
-char *parsetime(char *spec, struct time_value *ptv);
+char *parsetime(char *spec, struct rrd_time_value *ptv);
 /* END parsetime.h */
 
-int proc_start_end (struct time_value *,  struct time_value *, time_t *, time_t *);
+int proc_start_end (struct rrd_time_value *,  struct rrd_time_value *, time_t *, time_t *);
 
 /* HELPER FUNCTIONS */
 void rrd_set_error(char *,...);
--- rrdtool-1.0.45/src/rrd_cgi.c	Mon Jul 21 14:24:55 2003
+++ rrdtool-1.0.45-new/src/rrd_cgi.c	Sat Sep  6 16:56:42 2003
@@ -240,7 +240,7 @@
  * */
 #define MAX_STRFTIME_SIZE 256
 char* printstrftime(long argc, char **args){
-	struct	time_value start_tv, end_tv;
+	struct	rrd_time_value start_tv, end_tv;
 	char    *parsetime_error = NULL;
 	char	formatted[MAX_STRFTIME_SIZE];
 	struct tm *the_tm;
--- rrdtool-1.0.45/src/rrd_create.c	Mon Jul 21 14:24:55 2003
+++ rrdtool-1.0.45-new/src/rrd_create.c	Sat Sep  6 16:56:29 2003
@@ -13,7 +13,7 @@
     rrd_t          rrd;
     long                i,long_tmp;
     time_t             last_up;
-    struct time_value last_up_tv;
+    struct rrd_time_value last_up_tv;
     char *parsetime_error = NULL;
 
     /* init last_up */
--- rrdtool-1.0.45/src/rrd_fetch.c	Mon Jul 21 14:24:55 2003
+++ rrdtool-1.0.45-new/src/rrd_fetch.c	Sat Sep  6 16:56:18 2003
@@ -31,7 +31,7 @@
     time_t   start_tmp=0, end_tmp=0;
     enum     cf_en cf_idx;
 
-    struct time_value start_tv, end_tv;
+    struct rrd_time_value start_tv, end_tv;
     char     *parsetime_error = NULL;
 
     /* init start and end time */
--- rrdtool-1.0.45/src/rrd_graph.c	Mon Jul 21 14:24:56 2003
+++ rrdtool-1.0.45-new/src/rrd_graph.c	Sat Sep  6 16:56:05 2003
@@ -2806,7 +2806,7 @@
     unsigned int            col_red,col_green,col_blue;
     long           scancount;
     int linepass = 0; /* stack can only follow directly after LINE* AREA or STACK */    
-    struct time_value start_tv, end_tv;
+    struct rrd_time_value start_tv, end_tv;
     char *parsetime_error = NULL;
     int stroff;    
 
--- rrdtool-1.0.45/src/rrd_xport.c	Mon Jul 21 14:24:57 2003
+++ rrdtool-1.0.45-new/src/rrd_xport.c	Sat Sep  6 16:55:48 2003
@@ -45,7 +45,7 @@
     time_t	   start_tmp=0,end_tmp=0;
     char           symname[100];
     long           scancount;
-    struct time_value start_tv, end_tv;
+    struct rrd_time_value start_tv, end_tv;
     char           *parsetime_error = NULL;
 
     parsetime("end-24h", &start_tv);
--- rrdtool-1.0.45/tcl/Makefile.in	Mon Jul 21 14:28:10 2003
+++ rrdtool-1.0.45-new/tcl/Makefile.in	Sat Sep  6 15:38:06 2003
@@ -89,6 +89,7 @@
 TCL_SHLIB_LD = @TCL_SHLIB_LD@
 TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
 TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
+TCL_LIB_FILE = tclrrd.$(VERSION)$(TCL_SHLIB_SUFFIX)
 TCL_PACKAGE_PATH = $(DESTDIR)@TCL_PACKAGE_PATH@
 TCL_LIB_FILE = tclrrd.$(VERSION)$(TCL_SHLIB_SUFFIX)
 TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@