From b869e4be6a7faf6d519ce07f88d7ae4e085db04a Mon Sep 17 00:00:00 2001
From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Tue, 5 Sep 2006 18:34:47 +0000
Subject: [PATCH] put all the architecture specific stuff in separate
 subdirectories ... one for netwara and one for win32 -- Guenter Knauf

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@889 a5681a0c-68f1-0310-ab6d-d61299d08faa
---
 src/Makefile.NetWare => netware/Makefile |  59 +++----
 src/rrd_afm.c                            |   2 +-
 src/rrd_dump.c                           |   2 +-
 src/rrd_gfx.c                            |  15 +-
 src/rrd_graph.c                          |   6 +-
 src/rrd_tool.h                           |   2 +-
 src/rrdtool.sln                          |  30 ----
 src/win32comp.c                          | 134 ++++++++--------
 src/Makefile.Win32 => win32/Makefile     |  64 ++++----
 {confignt => win32}/config.h             |   8 +-
 {src => win32}/rrd.dsp                   |  80 ++++++----
 {src => win32}/rrd.vcproj                |   0
 {src => win32}/rrdtool.dsp               |  14 +-
 {src => win32}/rrdtool.dsw               |   0
 win32/rrdtool.plg                        | 253 +++++++++++++++++++++++++++++++
 {src => win32}/rrdtool.vcproj            |   0
 16 files changed, 460 insertions(+), 209 deletions(-)
 rename src/Makefile.NetWare => netware/Makefile (91%)
 delete mode 100644 src/rrdtool.sln
 rename src/Makefile.Win32 => win32/Makefile (89%)
 rename {confignt => win32}/config.h (88%)
 rename {src => win32}/rrd.dsp (68%)
 rename {src => win32}/rrd.vcproj (100%)
 rename {src => win32}/rrdtool.dsp (69%)
 rename {src => win32}/rrdtool.dsw (100%)
 create mode 100644 win32/rrdtool.plg
 rename {src => win32}/rrdtool.vcproj (100%)

diff --git a/src/Makefile.NetWare b/netware/Makefile
similarity index 91%
rename from src/Makefile.NetWare
rename to netware/Makefile
index 857ecc4..d28dba1 100644
--- a/src/Makefile.NetWare
+++ b/netware/Makefile
@@ -1,10 +1,9 @@
-# Gnu Makefile for NetWare target * 17-Aug-2006
+# Gnu Makefile for NetWare target * 25-Aug-2006
 # for use with gcc/nlmconv or Metrowerks CodeWarrior compiler
-# use with: make -f Makefile.NetWare [all|clean|dist|distclean|help]
+# use with: make -f Makefile [all|clean|dist|distclean|help]
 
 DESCR	= Round Robin Database Tool $(RRD_VERSION_STR)
 COPYR	= Copyright (c) 1997-2006 by Tobias Oetiker
-#WWWURL	= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/
 WWWURL	= http://www.rrdtool.org/
 MTSAFE	= YES
 #SCREEN	= $(DESCR)
@@ -12,18 +11,16 @@ STACK	= 65535
 # Comment the line below if you dont want to load protected automatically.
 #LDRING	= 3
 
-# Set the default font used in graphs.
-ifndef RRD_DEFAULT_FONT
+# You can set the default font used in graphs.
+# If not set here RRD defaults to DejaVuSansMono-Roman.ttf
 #RRD_DEFAULT_FONT = "sys:/java/nwgfx/lib/x11/fonts/ttf/tt0003m_.ttf"
-RRD_DEFAULT_FONT = "DejaVuSansMono-Roman.ttf"
 #RRD_DEFAULT_FONT = "VeraMono.ttf"
-endif
 
 # Vertical label angle: 90.0 (default) or 270.0
 RRDGRAPH_YLEGEND_ANGLE = 90.0
 
 # Set to one if you want to have piecharts.
-WITH_PIECHART = 1
+WITH_PIECHART = 0
 
 # Set the extension used for rrdcgi.
 ifndef CGIEXT
@@ -106,6 +103,9 @@ else
 	OBJDIR	= debug
 endif
 
+# Project root
+PROOT	= ..
+
 # Include the version info retrieved from source.
 -include $(OBJDIR)/version.inc
 
@@ -169,7 +169,7 @@ NDK_ROOT = $(NDKBASE)/ndk
 SDK_CLIB = $(NDK_ROOT)/nwsdk
 SDK_LIBC = $(NDK_ROOT)/libc
 
-INCLUDES = -I. -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
+INCLUDES += -I$(PROOT) -I$(PROOT)/src -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
 
 ifeq ($(LIBARCH),LIBC)
 	INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
@@ -179,7 +179,7 @@ endif
 
 CFLAGS += $(INCLUDES)
 
-vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
+vpath %.c $(PROOT)/src $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
 
 RRDLIBOBJS	= \
 	$(OBJDIR)/rrd_afm.o \
@@ -273,26 +273,26 @@ LDLIBS	+= $(LIBFT2)/builds/netware/libc/libft2.$(LIBEXT)
 
 all: rrdtool rrdcgi
 
-rrdtool: $(OBJDIR) config.h $(OBJDIR)/rrdtool.nlm
-rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
-librrd: $(OBJDIR) config.h $(OBJDIR)/librrd.$(LIBEXT)
+rrdtool: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdtool.nlm
+rrdcgi: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
+librrd: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/librrd.$(LIBEXT)
 
 dist: all $(DISTDIR) $(DISTDIR)/readme.txt
 #	@-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR)
 	@-$(CP) $(OBJDIR)/rrdcgi.$(CGIEXT) $(DISTDIR)
 	@-$(CP) $(OBJDIR)/rrdtool.nlm $(DISTDIR)
-	@-$(CP) $(RRD_DEFAULT_FONT) $(DISTDIR)
-	@-$(CP) ../CHANGES $(DISTDIR)
-	@-$(CP) ../COPYING $(DISTDIR)
-	@-$(CP) ../COPYRIGHT $(DISTDIR)
-	@-$(CP) ../NEWS $(DISTDIR)
-	@-$(CP) ../README $(DISTDIR)
+	@-$(CP) $(PROOT)/src/*.ttf $(DISTDIR)
+	@-$(CP) $(PROOT)/CHANGES $(DISTDIR)
+	@-$(CP) $(PROOT)/COPYING $(DISTDIR)
+	@-$(CP) $(PROOT)/COPYRIGHT $(DISTDIR)
+	@-$(CP) $(PROOT)/NEWS $(DISTDIR)
+	@-$(CP) $(PROOT)/README $(DISTDIR)
 	@echo Creating $(ARCHIVE)
 	@$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt
 
 clean:
 	-$(RM) -r $(OBJDIR)
-	-$(RM) config.h
+	-$(RM) $(PROOT)/config.h
 
 distclean: clean
 	-$(RM) -r $(DISTDIR)
@@ -308,9 +308,9 @@ $(OBJDIR)/%.o: %.c
 	@echo Compiling $<
 	@$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/version.inc: ../configure.ac $(OBJDIR) get_ver.awk
+$(OBJDIR)/version.inc: $(PROOT)/configure.ac $(OBJDIR) $(PROOT)/src/get_ver.awk
 	@echo Creating $@
-	@$(AWK) -f get_ver.awk $< > $@
+	@$(AWK) -f $(PROOT)/src/get_ver.awk $< > $@
 
 $(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc
 	@echo Linking $@
@@ -332,11 +332,11 @@ $(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
 	@-$(RM) $@
 	@$(AR) $(ARFLAGS) $@ $^
 
-$(OBJDIR)/%.xdc: Makefile.NetWare
+$(OBJDIR)/%.xdc: Makefile
 	@echo Creating $@
 	@$(MPKXDC) $(XDCOPT) $@
 
-$(OBJDIR)/%.def: Makefile.NetWare $(OBJDIR)/version.inc
+$(OBJDIR)/%.def: Makefile $(OBJDIR)/version.inc
 	@echo $(DL)# DEF Linker File for use with gcc and nlmconv$(DL) > $@
 	@echo $(DL)# or with Codewarrior command line compiler.$(DL) >> $@
 	@echo $(DL)# Do not edit this file - it is created by make!$(DL) >> $@
@@ -394,7 +394,7 @@ ifeq ($(LD),nlmconv)
 	@echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
 endif
 
-config.h: Makefile.NetWare
+$(PROOT)/config.h: Makefile
 	@echo Creating $@
 	@echo $(DL)/* $@ for NetWare target.$(DL) > $@
 	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
@@ -443,12 +443,11 @@ config.h: Makefile.NetWare
 	@echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SYS_TYPES_H 1$(DL) >> $@
-	@echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_TZSET 1$(DL) >> $@
 	@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
-	@echo $(DL)#define HAVE_VPRINTF 1$(DL) >> $@
 	@echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
+	@echo $(DL)#define HAVE_VSNPRINTF 1$(DL) >> $@
 	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
 	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@
@@ -459,13 +458,15 @@ ifdef NO_NULL_REALLOC
 else
 	@echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
 endif
-	@echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
+ifdef RRD_DEFAULT_FONT
 	@echo $(DL)#define RRD_DEFAULT_FONT $(RRD_DEFAULT_FONT)$(DL) >> $@
+endif
+	@echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
 ifdef WITH_PIECHART
 	@echo $(DL)#define WITH_PIECHART 1$(DL) >> $@
 endif
 
-$(DISTDIR)/readme.txt: Makefile.NetWare
+$(DISTDIR)/readme.txt: Makefile
 	@echo Creating $@
 	@echo $(DL)This is a binary distribution for NetWare platform.$(DL) > $@
 	@echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
diff --git a/src/rrd_afm.c b/src/rrd_afm.c
index 99a13b7..f7eea89 100644
--- a/src/rrd_afm.c
+++ b/src/rrd_afm.c
@@ -5,7 +5,7 @@
  ****************************************************************************/
 
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
-#include "../confignt/config.h"
+#include "../win32/config.h"
 #else
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index 8067870..aad0950 100644
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
@@ -44,7 +44,7 @@
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
 
-#ifndef NETWARE
+#if !(defined(NETWARE) || defined(WIN32))
 extern char *tzname[2];
 #endif
 
diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index 11a4e28..a139345 100644
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -6,11 +6,16 @@
 
 /* #define DEBUG */
 
-#ifdef DEBUG
-# define DPRINTF(...)  fprintf(stderr, __VA_ARGS__);
-#else
-# define DPRINTF(...)
-#endif
+/* stupid MSVC doesnt support variadic macros = no debug for now! */
+#ifdef _MSC_VER
+# define DPRINTF()
+#else 
+# ifdef DEBUG
+#  define DPRINTF(...)  fprintf(stderr, __VA_ARGS__);
+# else
+#  define DPRINTF(...)
+# endif /* DEBUG */
+#endif /* _MSC_VER */
 #include "rrd_tool.h"
 #include <png.h>
 #include <ft2build.h>
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index ecf19fd..a16734b 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -7,10 +7,12 @@
 
 #include <sys/stat.h>
 
+#ifdef WIN32
+#include "strftime.h"
+#endif
 #include "rrd_tool.h"
 
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "strftime.h"
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
 #include <io.h>
 #include <fcntl.h>
 #endif
diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 2d983a4..c554099 100644
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -12,7 +12,7 @@ extern "C" {
 #define _RRD_TOOL_H
 
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
-#include "../confignt/config.h"
+#include "../win32/config.h"
 #else
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/rrdtool.sln b/src/rrdtool.sln
deleted file mode 100644
index 3aaa738..0000000
--- a/src/rrdtool.sln
+++ /dev/null
@@ -1,30 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrd", "rrd.vcproj", "{8DF24CAC-DF33-4131-8584-529054E341B3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rrdtool", "rrdtool.vcproj", "{3A5A6297-3F61-498A-BA72-66D36144901B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8DF24CAC-DF33-4131-8584-529054E341B3} = {8DF24CAC-DF33-4131-8584-529054E341B3}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{8DF24CAC-DF33-4131-8584-529054E341B3}.Debug.ActiveCfg = Debug|Win32
-		{8DF24CAC-DF33-4131-8584-529054E341B3}.Debug.Build.0 = Debug|Win32
-		{8DF24CAC-DF33-4131-8584-529054E341B3}.Release.ActiveCfg = Release|Win32
-		{8DF24CAC-DF33-4131-8584-529054E341B3}.Release.Build.0 = Release|Win32
-		{3A5A6297-3F61-498A-BA72-66D36144901B}.Debug.ActiveCfg = Debug|Win32
-		{3A5A6297-3F61-498A-BA72-66D36144901B}.Debug.Build.0 = Debug|Win32
-		{3A5A6297-3F61-498A-BA72-66D36144901B}.Release.ActiveCfg = Release|Win32
-		{3A5A6297-3F61-498A-BA72-66D36144901B}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/src/win32comp.c b/src/win32comp.c
index 590e478..32f5337 100644
--- a/src/win32comp.c
+++ b/src/win32comp.c
@@ -1,67 +1,67 @@
-// compatibility routines, non reentrant ....
-
-#include <string.h> 
-#include <time.h>
-
-struct tm* localtime_r(const time_t* t, struct tm* r) {
-  struct tm * temp;
-  temp = localtime(t);
-  memcpy(r,temp,sizeof(struct tm));
-  return(r);
-}
-
-struct tm* gmtime_r(const time_t* t, struct tm* r) {
-  struct tm * temp;
-  temp = gmtime(t);
-  memcpy(r,temp,sizeof(struct tm));
-  return r;
-}
-
-char* ctime_r (const time_t* t, char* buf) {
-  char * temp;
-  temp = asctime(localtime(t));
-  strcpy(buf,temp);
-  return(buf);
-}
-
-/*
-	s  
-	Points to the string from which to extract tokens. 
-
-	delim  
-	Points to a null-terminated set of delimiter characters. 
-
-	save_ptr
-	Is a value-return parameter used by strtok_r() to record its progress through s1. 
-*/
-
-
-char * strtok_r (char *s, const char *delim, char **save_ptr) {
-  char *token;
-
-  if (s == NULL)  s = *save_ptr;
-
-  /* Scan leading delimiters.  */
-  s += strspn(s, delim);
-  if (*s == '\0')
-    {
-      *save_ptr = s;
-      return NULL;
-    }
-
-  /* Find the end of the token.  */
-  token = s;
-  s = strpbrk (token, delim);
-  if (s == NULL) {
-    /* This token finishes the string.  */
-	  *save_ptr = token;
-	  while (**save_ptr != '\0') (*save_ptr)++;
-  }  else
-    {
-      /* Terminate the token and make *SAVE_PTR point past it.  */
-      *s = '\0';
-      *save_ptr = s + 1;
-    }
-  return token;
-}
-
+// compatibility routines, non reentrant ....
+
+#include <string.h> 
+#include <time.h>
+
+struct tm* localtime_r(const time_t* t, struct tm* r) {
+  struct tm * temp;
+  temp = localtime(t);
+  memcpy(r,temp,sizeof(struct tm));
+  return(r);
+}
+
+struct tm* gmtime_r(const time_t* t, struct tm* r) {
+  struct tm * temp;
+  temp = gmtime(t);
+  memcpy(r,temp,sizeof(struct tm));
+  return r;
+}
+
+char* ctime_r (const time_t* t, char* buf) {
+  char * temp;
+  temp = asctime(localtime(t));
+  strcpy(buf,temp);
+  return(buf);
+}
+
+/*
+	s  
+	Points to the string from which to extract tokens. 
+
+	delim  
+	Points to a null-terminated set of delimiter characters. 
+
+	save_ptr
+	Is a value-return parameter used by strtok_r() to record its progress through s1. 
+*/
+
+
+char * strtok_r (char *s, const char *delim, char **save_ptr) {
+  char *token;
+
+  if (s == NULL)  s = *save_ptr;
+
+  /* Scan leading delimiters.  */
+  s += strspn(s, delim);
+  if (*s == '\0')
+    {
+      *save_ptr = s;
+      return NULL;
+    }
+
+  /* Find the end of the token.  */
+  token = s;
+  s = strpbrk (token, delim);
+  if (s == NULL) {
+    /* This token finishes the string.  */
+	  *save_ptr = token;
+	  while (**save_ptr != '\0') (*save_ptr)++;
+  }  else
+    {
+      /* Terminate the token and make *SAVE_PTR point past it.  */
+      *s = '\0';
+      *save_ptr = s + 1;
+    }
+  return token;
+}
+
diff --git a/src/Makefile.Win32 b/win32/Makefile
similarity index 89%
rename from src/Makefile.Win32
rename to win32/Makefile
index ce7c752..c82a111 100644
--- a/src/Makefile.Win32
+++ b/win32/Makefile
@@ -1,25 +1,22 @@
-# Gnu Makefile for Win32 target * 17-Aug-2006
+# Gnu Makefile for Win32 target * 25-Aug-2006
 # for use with MingW32 gcc or Metrowerks CodeWarrior compiler
-# use with: make -f Makefile.Win32 [all|clean|dist|distclean|help]
+# use with: make -f Makefile [all|clean|dist|distclean|help]
 
 DESCR	= Round Robin Database Tool
 COPYR	= Copyright (c) 1997-2006 by Tobias Oetiker
-#WWWURL	= http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/
 WWWURL	= http://www.rrdtool.org/
-ICON	= ../favicon.ico
+ICON	= $(PROOT)/favicon.ico
 
-# Set the default font used in graphs.
-ifndef RRD_DEFAULT_FONT
+# You can set the default font used in graphs.
+# If not set here RRD defaults to DejaVuSansMono-Roman.ttf
 #RRD_DEFAULT_FONT = "arial.ttf"
-RRD_DEFAULT_FONT = "DejaVuSansMono-Roman.ttf"
 #RRD_DEFAULT_FONT = "VeraMono.ttf"
-endif
 
 # Vertical label angle: 90.0 (default) or 270.0
 RRDGRAPH_YLEGEND_ANGLE = 90.0
 
 # Set to one if you want to have piecharts.
-WITH_PIECHART = 1
+WITH_PIECHART = 0
 
 # Set the extension used for rrdcgi.
 ifndef CGIEXT
@@ -83,6 +80,9 @@ else
 	OBJDIR	= debug
 endif
 
+# Project root
+PROOT	= ..
+
 # Include the version info retrieved from source.
 -include $(OBJDIR)/version.inc
 
@@ -122,11 +122,11 @@ ifndef DESCR
 endif
 DESCR += - $(CC) build
 
-INCLUDES += -I. -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
+INCLUDES += -I$(PROOT) -I$(PROOT)/src -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
 
 CFLAGS += $(INCLUDES)
 
-vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
+vpath %.c $(PROOT)/src $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
 
 RRDLIBOBJS	= \
 	$(OBJDIR)/rrd_afm.o \
@@ -221,26 +221,26 @@ LDLIBS	+= $(LIBFT2)/objs/freetype.$(LIBEXT)
 
 all: rrdtool rrdcgi
 
-rrdtool: $(OBJDIR) config.h $(OBJDIR)/rrdtool.exe
-rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
-librrd: $(OBJDIR) config.h $(OBJDIR)/librrd.$(LIBEXT)
+rrdtool: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdtool.exe
+rrdcgi: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
+librrd: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/librrd.$(LIBEXT)
 
 dist: all $(DISTDIR) $(DISTDIR)/readme.txt
 #	@-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR)
 	@-$(CP) $(OBJDIR)/rrdcgi.$(CGIEXT) $(DISTDIR)
 	@-$(CP) $(OBJDIR)/rrdtool.exe $(DISTDIR)
-	@-$(CP) $(RRD_DEFAULT_FONT) $(DISTDIR)
-	@-$(CP) ../CHANGES $(DISTDIR)
-	@-$(CP) ../COPYING $(DISTDIR)
-	@-$(CP) ../COPYRIGHT $(DISTDIR)
-	@-$(CP) ../NEWS $(DISTDIR)
-	@-$(CP) ../README $(DISTDIR)
+	@-$(CP) $(PROOT)/src/*.ttf $(DISTDIR)
+	@-$(CP) $(PROOT)/CHANGES $(DISTDIR)
+	@-$(CP) $(PROOT)/COPYING $(DISTDIR)
+	@-$(CP) $(PROOT)/COPYRIGHT $(DISTDIR)
+	@-$(CP) $(PROOT)/NEWS $(DISTDIR)
+	@-$(CP) $(PROOT)/README $(DISTDIR)
 	@echo Creating $(ARCHIVE)
 	@$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt
 
 clean:
 	-$(RM) -r $(OBJDIR)
-	-$(RM) config.h
+	-$(RM) $(PROOT)/config.h
 
 distclean: clean
 	-$(RM) -r $(DISTDIR)
@@ -252,9 +252,9 @@ $(OBJDIR):
 $(DISTDIR):
 	@mkdir $@
 
-$(OBJDIR)/version.inc: ../configure.ac $(OBJDIR) get_ver.awk
+$(OBJDIR)/version.inc: $(PROOT)/configure.ac $(OBJDIR) $(PROOT)/src/get_ver.awk
 	@echo Creating $@
-	@$(AWK) -f get_ver.awk $< > $@
+	@$(AWK) -f $(PROOT)/src/get_ver.awk $< > $@
 
 $(OBJDIR)/%.o: %.c
 	@echo Compiling $<
@@ -279,7 +279,7 @@ $(OBJDIR)/%.res: $(OBJDIR)/%.rc
 	@echo Creating $@
 	@$(RC) $(RCFLAGS) $< -o $@
 
-$(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc
+$(OBJDIR)/%.rc: Makefile $(OBJDIR)/version.inc
 	@echo 1 VERSIONINFO > $@
 	@echo  FILEVERSION $(RRD_VERSION),0 >> $@
 	@echo  PRODUCTVERSION $(RRD_VERSION),0 >> $@
@@ -313,12 +313,12 @@ endif
 	@echo   END >> $@
 	@echo END >> $@
 ifdef ICON
-	@echo 1 ICON DISCARDABLE "$(ICON)" >> $@
+	@echo 10 ICON DISCARDABLE "$(ICON)" >> $@
 endif
 
-config.h: Makefile.Win32 $(OBJDIR)/version.inc
+$(PROOT)/config.h: Makefile $(OBJDIR)/version.inc
 	@echo Creating $@
-	@echo $(DL)/* $@ for NetWare target.$(DL) > $@
+	@echo $(DL)/* $@ for Win32 target.$(DL) > $@
 	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
 	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
 	@echo $(DL)*/$(DL) >> $@
@@ -349,7 +349,7 @@ config.h: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo $(DL)#define HAVE_STDDEF_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@
-#	@echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@
+	@echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
@@ -360,9 +360,9 @@ config.h: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@
-	@echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
+	@echo $(DL)#define HAVE_VSNPRINTF 1$(DL) >> $@
 	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
 	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@
@@ -373,14 +373,16 @@ ifdef NO_NULL_REALLOC
 else
 	@echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
 endif
-	@echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
+ifdef RRD_DEFAULT_FONT
 	@echo $(DL)#define RRD_DEFAULT_FONT $(RRD_DEFAULT_FONT)$(DL) >> $@
+endif
+	@echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
 	@echo $(DL)#define strftime strftime_$(DL) >> $@
 ifdef WITH_PIECHART
 	@echo $(DL)#define WITH_PIECHART 1$(DL) >> $@
 endif
 
-$(DISTDIR)/readme.txt: Makefile.Win32
+$(DISTDIR)/readme.txt: Makefile
 	@echo Creating $@
 	@echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@
 	@echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
diff --git a/confignt/config.h b/win32/config.h
similarity index 88%
rename from confignt/config.h
rename to win32/config.h
index becfab9..965d525 100644
--- a/confignt/config.h
+++ b/win32/config.h
@@ -1,9 +1,10 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
+/* config.h.msvc.  Hand-tweaked config.h for MSVC compiler.  */
 #ifndef CONFIG_H
 #define CONFIG_H
 
 #include <math.h>
 #include <float.h>
+#include <direct.h>
 
 /* realloc does not support NULL as argument */
 
@@ -19,7 +20,7 @@
 #define HAVE_MKTIME 1
 #define HAVE_STRFTIME 1
 #define HAVE_STRING_H 1
-#define HAVE_VPRINTF 1
+#define HAVE_VSNPRINTF 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
 
@@ -35,6 +36,7 @@
 #define isnan _isnan
 #define finite _finite
 #define snprintf _snprintf
+#define vsnprintf _vsnprintf
 #define strftime strftime_ 
 
 #define NO_NULL_REALLOC 1
@@ -52,7 +54,7 @@
 
 /* #define WITH_PIECHART 1 */
 
-//#define DEBUG 1
+/* #define DEBUG 1 */
 
 #endif /* CONFIG_H */
 
diff --git a/src/rrd.dsp b/win32/rrd.dsp
similarity index 68%
rename from src/rrd.dsp
rename to win32/rrd.dsp
index 61e102c..09533e9 100644
--- a/src/rrd.dsp
+++ b/win32/rrd.dsp
@@ -41,10 +41,10 @@ RSC=rc.exe
 # PROP Intermediate_Dir "release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /I "\Program Files\GnuWin32\include" /I "\Program Files\GnuWin32\include\freetype2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.12" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.2.1/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
 # SUBTRACT CPP /X /YX
 # ADD BASE RSC /l 0x100c
-# ADD RSC /l 0x100c
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -65,10 +65,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "\Program Files\GnuWin32\include\freetype2" /I "\Program Files\GnuWin32\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.12" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.2.1/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
 # SUBTRACT CPP /X /YX
 # ADD BASE RSC /l 0x100c
-# ADD RSC /l 0x100c
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo /o"rrd.bsc"
@@ -84,115 +84,131 @@ LIB32=link.exe -lib
 # Name "rrd - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\getopt.c
+SOURCE=..\src\rrd_afm.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\getopt1.c
+SOURCE=..\src\rrd_afm_data.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\hash_32.c
+SOURCE=..\src\rrd_create.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\parsetime.c
+SOURCE=..\src\rrd_diff.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\pngsize.c
+SOURCE=..\src\rrd_dump.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_afm.c
+SOURCE=..\src\rrd_error.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_afm_data.c
+SOURCE=..\src\rrd_fetch.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_create.c
+SOURCE=..\src\rrd_first.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_diff.c
+SOURCE=..\src\rrd_format.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_dump.c
+SOURCE=..\src\rrd_gfx.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_error.c
+SOURCE=..\src\rrd_graph.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_fetch.c
+SOURCE=..\src\rrd_graph_helper.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_format.c
+SOURCE=..\src\rrd_hw.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_gfx.c
+SOURCE=..\src\rrd_info.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_graph.c
+SOURCE=..\src\rrd_last.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_graph_helper.c
+SOURCE=..\src\rrd_nan_inf.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_hw.c
+SOURCE=..\src\rrd_open.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_info.c
+SOURCE=..\src\rrd_resize.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_last.c
+SOURCE=..\src\rrd_restore.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_nan_inf.c
+SOURCE=..\src\rrd_rpncalc.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_open.c
+SOURCE=..\src\rrd_thread_safe_nt.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_resize.c
+SOURCE=..\src\rrd_tune.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_restore.c
+SOURCE=..\src\rrd_update.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_rpncalc.c
+SOURCE=..\src\rrd_version.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_thread_safe_nt.c
+SOURCE=..\src\rrd_xport.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_tune.c
+SOURCE=..\src\art_rgba_svp.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_update.c
+SOURCE=..\src\getopt.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\rrd_xport.c
+SOURCE=..\src\getopt1.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\hash_32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\parsetime.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\pngsize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\strftime.c
 # End Source File
 # End Target
 # End Project
diff --git a/src/rrd.vcproj b/win32/rrd.vcproj
similarity index 100%
rename from src/rrd.vcproj
rename to win32/rrd.vcproj
diff --git a/src/rrdtool.dsp b/win32/rrdtool.dsp
similarity index 69%
rename from src/rrdtool.dsp
rename to win32/rrdtool.dsp
index 8a38176..9630cb9 100644
--- a/src/rrdtool.dsp
+++ b/win32/rrdtool.dsp
@@ -42,16 +42,16 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /I "\Program Files\GnuWin32\include" /I "\Program Files\GnuWin32\include\freetype2" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.12" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.2.1/include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x100c /d "NDEBUG"
-# ADD RSC /l 0x100c /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libpng.lib libz.lib libart_lgpl.lib libfreetype.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"\Program Files\GnuWin32\lib"
+# ADD LINK32 libpng.lib zlib.lib libart.lib freetype221MT.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"../../libpng-1.2.12/projects/visualc6/Win32_LIB_Release" /libpath:"../../zlib-1.2.3" /libpath:"../../libart_lgpl-2.3.17/win32/release" /libpath:"../../freetype-2.2.1/objs"
 
 !ELSEIF  "$(CFG)" == "rrdtool - Win32 Debug"
 
@@ -67,16 +67,16 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "\Program Files\GnuWin32\include\freetype2" /I "\Program Files\GnuWin32\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.12" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.2.1/include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x100c /d "_DEBUG"
-# ADD RSC /l 0x100c /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo /o"rrdtool.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libpng.lib libz.lib libart_lgpl.lib libfreetype.lib kernel32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\Program Files\GnuWin32\lib"
+# ADD LINK32 libpng.lib zlib.lib libart.lib freetype221MT.lib kernel32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../libpng-1.2.12/projects/visualc6/Win32_LIB_Release" /libpath:"../../zlib-1.2.3" /libpath:"../../libart_lgpl-2.3.17/win32/release" /libpath:"../../freetype-2.2.1/objs"
 
 !ENDIF 
 
@@ -86,7 +86,7 @@ LINK32=link.exe
 # Name "rrdtool - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\rrd_tool.c
+SOURCE=..\src\rrd_tool.c
 # End Source File
 # End Target
 # End Project
diff --git a/src/rrdtool.dsw b/win32/rrdtool.dsw
similarity index 100%
rename from src/rrdtool.dsw
rename to win32/rrdtool.dsw
diff --git a/win32/rrdtool.plg b/win32/rrdtool.plg
new file mode 100644
index 0000000..d840c32
--- /dev/null
+++ b/win32/rrdtool.plg
@@ -0,0 +1,253 @@
+<html>
+<body>
+<pre>
+<h1>Erstellungsprotokoll</h1>
+<h3>
+--------------------Konfiguration: rrd - Win32 Release--------------------
+</h3>
+<h3>Befehlszeilen</h3>
+Erstellen der temporären Datei  "C:\WINNT\TEMP\RSP68.tmp" mit Inhalten
+[
+/nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.12" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.2.1/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /Fo"release/" /Fd"release/" /FD /c 
+"D:\projects\msvc\program_883_new\src\rrd_afm.c"
+"D:\projects\msvc\program_883_new\src\rrd_afm_data.c"
+"D:\projects\msvc\program_883_new\src\rrd_create.c"
+"D:\projects\msvc\program_883_new\src\rrd_diff.c"
+"D:\projects\msvc\program_883_new\src\rrd_dump.c"
+"D:\projects\msvc\program_883_new\src\rrd_error.c"
+"D:\projects\msvc\program_883_new\src\rrd_fetch.c"
+"D:\projects\msvc\program_883_new\src\rrd_first.c"
+"D:\projects\msvc\program_883_new\src\rrd_format.c"
+"D:\projects\msvc\program_883_new\src\rrd_gfx.c"
+"D:\projects\msvc\program_883_new\src\rrd_graph.c"
+"D:\projects\msvc\program_883_new\src\rrd_graph_helper.c"
+"D:\projects\msvc\program_883_new\src\rrd_hw.c"
+"D:\projects\msvc\program_883_new\src\rrd_info.c"
+"D:\projects\msvc\program_883_new\src\rrd_last.c"
+"D:\projects\msvc\program_883_new\src\rrd_nan_inf.c"
+"D:\projects\msvc\program_883_new\src\rrd_open.c"
+"D:\projects\msvc\program_883_new\src\rrd_resize.c"
+"D:\projects\msvc\program_883_new\src\rrd_restore.c"
+"D:\projects\msvc\program_883_new\src\rrd_rpncalc.c"
+"D:\projects\msvc\program_883_new\src\rrd_thread_safe_nt.c"
+"D:\projects\msvc\program_883_new\src\rrd_tune.c"
+"D:\projects\msvc\program_883_new\src\rrd_update.c"
+"D:\projects\msvc\program_883_new\src\rrd_version.c"
+"D:\projects\msvc\program_883_new\src\rrd_xport.c"
+"D:\projects\msvc\program_883_new\src\art_rgba_svp.c"
+"D:\projects\msvc\program_883_new\src\getopt.c"
+"D:\projects\msvc\program_883_new\src\getopt1.c"
+"D:\projects\msvc\program_883_new\src\hash_32.c"
+"D:\projects\msvc\program_883_new\src\parsetime.c"
+"D:\projects\msvc\program_883_new\src\pngsize.c"
+"D:\projects\msvc\program_883_new\src\strftime.c"
+]
+Creating command line "cl.exe @C:\WINNT\TEMP\RSP68.tmp" 
+Erstellen der temporären Datei  "C:\WINNT\TEMP\RSP69.tmp" mit Inhalten
+[
+/nologo /out:"release\rrd.lib" 
+.\release\rrd_afm.obj
+.\release\rrd_afm_data.obj
+.\release\rrd_create.obj
+.\release\rrd_diff.obj
+.\release\rrd_dump.obj
+.\release\rrd_error.obj
+.\release\rrd_fetch.obj
+.\release\rrd_first.obj
+.\release\rrd_format.obj
+.\release\rrd_gfx.obj
+.\release\rrd_graph.obj
+.\release\rrd_graph_helper.obj
+.\release\rrd_hw.obj
+.\release\rrd_info.obj
+.\release\rrd_last.obj
+.\release\rrd_nan_inf.obj
+.\release\rrd_open.obj
+.\release\rrd_resize.obj
+.\release\rrd_restore.obj
+.\release\rrd_rpncalc.obj
+.\release\rrd_thread_safe_nt.obj
+.\release\rrd_tune.obj
+.\release\rrd_update.obj
+.\release\rrd_version.obj
+.\release\rrd_xport.obj
+.\release\art_rgba_svp.obj
+.\release\getopt.obj
+.\release\getopt1.obj
+.\release\hash_32.obj
+.\release\parsetime.obj
+.\release\pngsize.obj
+.\release\strftime.obj
+]
+Erstellen der Befehlzeile "link.exe -lib @C:\WINNT\TEMP\RSP69.tmp"
+<h3>Ausgabefenster</h3>
+Kompilierung läuft...
+rrd_afm.c
+rrd_afm_data.c
+rrd_create.c
+rrd_diff.c
+rrd_dump.c
+D:\projects\msvc\program_883_new\src\rrd_dump.c(321) : warning C4146: Einem vorzeichenlosen Typ wurde ein unaerer Minus-Operator zugewiesen; das Ergebnis ist weiterhin vorzeichenlos
+rrd_error.c
+rrd_fetch.c
+rrd_first.c
+D:\projects\msvc\program_883_new\src\rrd_first.c(57) : warning C4028: Formaler Parameter 2 unterscheidet sich von der Deklaration
+D:\projects\msvc\program_883_new\src\rrd_first.c(83) : warning C4146: Einem vorzeichenlosen Typ wurde ein unaerer Minus-Operator zugewiesen; das Ergebnis ist weiterhin vorzeichenlos
+rrd_format.c
+rrd_gfx.c
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(316) : warning C4244: 'function' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(316) : warning C4244: 'function' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(470) : warning C4002: Zu viele uebergebene Parameter fuer das Makro 'DPRINTF'
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(475) : warning C4002: Zu viele uebergebene Parameter fuer das Makro 'DPRINTF'
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(482) : warning C4244: '=' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(497) : warning C4002: Zu viele uebergebene Parameter fuer das Makro 'DPRINTF'
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(507) : warning C4002: Zu viele uebergebene Parameter fuer das Makro 'DPRINTF'
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(544) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'unsigned long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(545) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'unsigned long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(606) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'unsigned char ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(607) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'unsigned char ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(608) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'unsigned char ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(609) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'unsigned char ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(625) : warning C4244: '=' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(626) : warning C4244: '=' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(628) : warning C4244: 'function' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(662) : warning C4002: Zu viele uebergebene Parameter fuer das Makro 'DPRINTF'
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(667) : warning C4002: Zu viele uebergebene Parameter fuer das Makro 'DPRINTF'
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(696) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(700) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(716) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(720) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(1071) : warning C4090: 'initializing' : Unterschiedliche 'const'-Bezeichner
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(1072) : warning C4101: 'cstr' : Unreferenzierte lokale Variable
+rrd_graph.c
+D:\projects\msvc\program_883_new\src\rrd_graph.c(294) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(348) : warning C4244: '=' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(524) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(836) : warning C4244: '=' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1027) : warning C4244: '=' : Konvertierung von 'double ' in 'unsigned long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1404) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1405) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1466) : warning C4244: '+=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1501) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1516) : warning C4244: '+=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1521) : warning C4244: '+=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1523) : warning C4244: '-=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1532) : warning C4244: '+=' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1571) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1593) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1606) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1707) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1793) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1804) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1804) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1824) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1853) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1858) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1859) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1910) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1915) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(1916) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2217) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2218) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2382) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2397) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2404) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2411) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2481) : warning C4244: '+=' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2482) : warning C4244: '+=' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2735) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2735) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2755) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2755) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2755) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2755) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2763) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2763) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2763) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2763) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2770) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2770) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2770) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(2770) : warning C4244: 'function' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph.c(3775) : warning C4244: '=' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+rrd_graph_helper.c
+D:\projects\msvc\program_883_new\src\rrd_graph_helper.c(201) : warning C4028: Formaler Parameter 4 unterscheidet sich von der Deklaration
+D:\projects\msvc\program_883_new\src\rrd_graph_helper.c(386) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph_helper.c(390) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph_helper.c(391) : warning C4244: '=' : Konvertierung von 'float ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_graph_helper.c(786) : warning C4028: Formaler Parameter 3 unterscheidet sich von der Deklaration
+D:\projects\msvc\program_883_new\src\rrd_graph_helper.c(829) : warning C4244: '=' : Konvertierung von 'double ' in 'float ', moeglicher Datenverlust
+rrd_hw.c
+D:\projects\msvc\program_883_new\src\rrd_hw.c(447) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'unsigned short ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_hw.c(461) : warning C4244: 'return' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_hw.c(496) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'unsigned short ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_hw.c(526) : warning C4244: '=' : Konvertierung von 'double ' in 'unsigned long ', moeglicher Datenverlust
+rrd_info.c
+rrd_last.c
+rrd_nan_inf.c
+rrd_open.c
+rrd_resize.c
+rrd_restore.c
+rrd_rpncalc.c
+D:\projects\msvc\program_883_new\src\rrd_rpncalc.c(763) : warning C4244: 'initializing' : Konvertierung von 'double ' in 'int ', moeglicher Datenverlust
+Generieren von Code...
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(316) : warning C4761: Größenkonflikt im Argument. Konvertierung vorgenommen
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(316) : warning C4761: Größenkonflikt im Argument. Konvertierung vorgenommen
+D:\projects\msvc\program_883_new\src\rrd_gfx.c(628) : warning C4761: Größenkonflikt im Argument. Konvertierung vorgenommen
+Kompilieren...
+rrd_thread_safe_nt.c
+rrd_tune.c
+D:\projects\msvc\program_883_new\src\rrd_tune.c(321) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'short ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_tune.c(353) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'short ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_tune.c(386) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'short ', moeglicher Datenverlust
+rrd_update.c
+D:\projects\msvc\program_883_new\src\rrd_update.c(536) : warning C4244: '=' : Konvertierung von 'double ' in 'long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_update.c(744) : warning C4244: '+=' : Konvertierung von 'double ' in 'unsigned long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_update.c(830) : warning C4244: '=' : Konvertierung von 'double ' in 'unsigned long ', moeglicher Datenverlust
+D:\projects\msvc\program_883_new\src\rrd_update.c(1176) : warning C4244: '=' : Konvertierung von 'unsigned long ' in 'short ', moeglicher Datenverlust
+rrd_version.c
+rrd_xport.c
+art_rgba_svp.c
+getopt.c
+D:\projects\msvc\program_883_new\src\getopt.c(215) : warning C4273: 'getenv' : Inkonsistente DLL-Bindung. dllexport angenommen.
+getopt1.c
+hash_32.c
+parsetime.c
+pngsize.c
+strftime.c
+Generieren von Code...
+D:\projects\msvc\program_883_new\src\rrd_update.c(156) : warning C4700: Lokale Variable 'rc' wurde ohne Initialisierung verwendet
+Bibliothek wird erstellt...
+<h3>
+--------------------Konfiguration: rrdtool - Win32 Release--------------------
+</h3>
+<h3>Befehlszeilen</h3>
+Erstellen der temporären Datei  "C:\WINNT\TEMP\RSP6A.tmp" mit Inhalten
+[
+/nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.12" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.2.1/include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /Fo"toolrelease/" /Fd"toolrelease/" /FD /c 
+"D:\projects\msvc\program_883_new\src\rrd_tool.c"
+]
+Creating command line "cl.exe @C:\WINNT\TEMP\RSP6A.tmp" 
+Erstellen der temporären Datei  "C:\WINNT\TEMP\RSP6B.tmp" mit Inhalten
+[
+libpng.lib zlib.lib libart.lib freetype221MT.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:yes /pdb:"toolrelease/rrdtool.pdb" /debug /machine:I386 /out:"toolrelease/rrdtool.exe" /libpath:"../../libpng-1.2.12/projects/visualc6/Win32_LIB_Release" /libpath:"../../zlib-1.2.3" /libpath:"../../libart_lgpl-2.3.17/win32/release" /libpath:"../../freetype-2.2.1/objs" 
+.\toolrelease\rrd_tool.obj
+.\release\rrd.lib
+]
+Erstellen der Befehlzeile "link.exe @C:\WINNT\TEMP\RSP6B.tmp"
+<h3>Ausgabefenster</h3>
+Kompilierung läuft...
+rrd_tool.c
+D:\projects\msvc\program_883_new\src\rrd_tool.c(461) : warning C4101: 'st' : Unreferenzierte lokale Variable
+D:\projects\msvc\program_883_new\src\rrd_tool.c(463) : warning C4101: 'cwd' : Unreferenzierte lokale Variable
+Linker-Vorgang läuft...
+MSVCRT.lib(cinitexe.obj) : warning LNK4098: Standardbibliothek "libcmt.lib" steht in Konflikt mit anderen Bibliotheken; /NODEFAULT:Bibliothek verwenden
+LINK : warning LNK4049: Lokal definiertes Symbol "_strftime_" importiert
+
+
+
+<h3>Ergebnisse</h3>
+rrdtool.exe - 0 Fehler, 104 Warnung(en)
+</pre>
+</body>
+</html>
diff --git a/src/rrdtool.vcproj b/win32/rrdtool.vcproj
similarity index 100%
rename from src/rrdtool.vcproj
rename to win32/rrdtool.vcproj
-- 
2.11.0