![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf15c77)
raw | patch | inline | side by side (parent: cf15c77)
| author | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Tue, 5 Sep 2006 18:34:47 +0000 (18:34 +0000) | ||
| committer | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
| Tue, 5 Sep 2006 18:34:47 +0000 (18:34 +0000) |
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@889 a5681a0c-68f1-0310-ab6d-d61299d08faa
24 files changed:
diff --git a/confignt/config.h b/confignt/config.h
--- a/confignt/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include <math.h>
-#include <float.h>
-
-/* realloc does not support NULL as argument */
-
-#define HAVE_STRFTIME 1
-#define HAVE_TIME_H 1
-#define HAVE_LOCALE_H 1
-#define HAVE_TZSET 1
-#define HAVE_SETLOCALE 1
-#define HAVE_MATH_H 1
-#define HAVE_FLOAT_H 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MKTIME 1
-#define HAVE_STRFTIME 1
-#define HAVE_STRING_H 1
-#define HAVE_VPRINTF 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-#define NUMVERS 1.2015
-#define PACKAGE_NAME "rrdtool"
-#define PACKAGE_VERSION "1.2.15"
-#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
-
-#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
-#define isnan _isnan
-#define finite _finite
-#define snprintf _snprintf
-#define strftime strftime_
-
-#define NO_NULL_REALLOC 1
-#if NO_NULL_REALLOC
-# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
-#else
-# define rrd_realloc(a,b) realloc((a), (b))
-#endif
-
-/* Vertical label angle: 90.0 (default) or 270.0 */
-#define RRDGRAPH_YLEGEND_ANGLE 90.0
-
-#define RRD_DEFAULT_FONT "arial.ttf"
-/* #define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf" */
-
-/* #define WITH_PIECHART 1 */
-
-//#define DEBUG 1
-
-#endif /* CONFIG_H */
-
diff --git a/netware/Makefile b/netware/Makefile
--- /dev/null
+++ b/netware/Makefile
@@ -0,0 +1,495 @@
+# Gnu Makefile for NetWare target * 25-Aug-2006
+# for use with gcc/nlmconv or Metrowerks CodeWarrior compiler
+# 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://www.rrdtool.org/
+MTSAFE = YES
+#SCREEN = $(DESCR)
+STACK = 65535
+# Comment the line below if you dont want to load protected automatically.
+#LDRING = 3
+
+# 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 = "VeraMono.ttf"
+
+# 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 = 0
+
+# Set the extension used for rrdcgi.
+ifndef CGIEXT
+CGIEXT = nlm
+endif
+
+# Edit the path below to point to your Novell NDK.
+ifndef NDKBASE
+NDKBASE = c:/novell
+endif
+
+# Base for the lib sources
+ifndef LIBBASE
+LIBBASE = ../..
+endif
+# All library code is statically linked to avoid problems with other lib NLMs.
+# Edit the path below to point to your libpng sources or set environment var.
+ifndef LIBPNG
+LIBPNG = $(LIBBASE)/libpng-1.2.12
+endif
+# Edit the path below to point to your freetype sources or set environment var.
+ifndef LIBFT2
+LIBFT2 = $(LIBBASE)/freetype-2.2.1
+endif
+# Edit the path below to point to your libart sources or set environment var.
+ifndef LIBART
+LIBART = $(LIBBASE)/libart_lgpl-2.3.17
+endif
+# Edit the path below to point to your zlib sources or set environment var.
+ifndef ZLIBSDK
+ZLIBSDK = $(LIBBASE)/zlib-1.2.3
+endif
+
+# Edit the path below to point to your distribution folder.
+ifndef DISTDIR
+DISTDIR = rrdtool-$(RRD_VERSION_STR)-nw
+endif
+ARCHIVE = $(DISTDIR).zip
+
+# whatever...
+# NO_NULL_REALLOC = 1
+
+# Edit the var below to point to your lib architecture.
+ifndef LIBARCH
+# LIBARCH = CLIB
+LIBARCH = LIBC
+endif
+
+# The following line defines your compiler.
+ifdef METROWERKS
+ CC = mwccnlm
+else
+ CC = gcc
+endif
+# RM = rm -f
+CP = cp -afv
+# if you want to mark the target as MTSAFE you will need a tool for
+# generating the xdc data for the linker; here's a minimal tool:
+# http://www.gknw.net/development/prgtools/mkxdc.zip
+MPKXDC = mkxdc
+# CodeWarrior is too stupid to set the internal name properly when
+# the extension is not a NLM and not a registered type. So we need
+# to fix that after linking (since CGI isnt a known type - argh!):
+# http://www.gknw.net/development/prgtools/fixnlmname.zip
+FIXNLMN = fixnlmname #-q
+# Here you can find a native Win32 binary of the original awk:
+# http://www.gknw.net/development/prgtools/awk.zip
+AWK = awk
+ZIP = zip -qzR9
+
+# must be equal to DEBUG or NDEBUG
+DB = NDEBUG
+# DB = DEBUG
+# Optimization: -O<n> or debugging: -g
+ifeq ($(DB),NDEBUG)
+ OPT = -O2
+ OBJDIR = release
+else
+ OPT = -g
+ OBJDIR = debug
+endif
+
+# Project root
+PROOT = ..
+
+# Include the version info retrieved from source.
+-include $(OBJDIR)/version.inc
+
+# Global flags for all compilers
+CFLAGS = $(OPT) -D$(DB) -nostdinc -DNETWARE -DN_PLAT_NLM -D_POSIX_SOURCE
+CFLAGS += -DHAVE_CONFIG_H
+
+ifeq ($(CC),mwccnlm)
+LD = mwldnlm
+LDFLAGS = -nostdlib $^ $(PRELUDE) $(LDLIBS) -o $@ -commandfile
+AR = $(LD)
+ARFLAGS = -type library -w nocmdline $(OBJS) -o
+LIBEXT = lib
+CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
+CFLAGS += -relax_pointers
+#CFLAGS += -w on,nounused,nounusedexpr # -ansi strict
+ifeq ($(LIBARCH),LIBC)
+ PRELUDE = $(SDK_LIBC)/imports/libcpre.o
+ CFLAGS += -align 4
+else
+ PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
+ CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
+ CFLAGS += -align 1
+endif
+else
+LD = nlmconv
+LDFLAGS = -T
+AR = ar
+ARFLAGS = -cq
+LIBEXT = a
+CFLAGS += -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
+CFLAGS += -Wall -Wno-unused # -pedantic
+ifeq ($(LIBARCH),LIBC)
+ PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
+else
+ PRELUDE = $(NDK_ROOT)/pre/prelude.o
+ CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
+endif
+endif
+
+ifeq ($(findstring linux,$(OSTYPE)),linux)
+#include $(NDKBASE)/nlmconv/ncpfs.inc
+DL = '
+endif
+
+ifeq ($(MTSAFE),YES)
+ XDCOPT = -n
+endif
+ifeq ($(MTSAFE),NO)
+ XDCOPT = -u
+endif
+ifndef COPYR
+ COPYR = Copyright (c) 2006 The Open Source Community.
+endif
+ifndef DESCR
+ DESCR = $(notdir $(@:.def=)) Command Extension
+endif
+DESCR += ($(LIBARCH)) - $(CC) build
+
+NDK_ROOT = $(NDKBASE)/ndk
+SDK_CLIB = $(NDK_ROOT)/nwsdk
+SDK_LIBC = $(NDK_ROOT)/libc
+
+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
+else
+ INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+endif
+
+CFLAGS += $(INCLUDES)
+
+vpath %.c $(PROOT)/src $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
+
+RRDLIBOBJS = \
+ $(OBJDIR)/rrd_afm.o \
+ $(OBJDIR)/rrd_afm_data.o \
+ $(OBJDIR)/rrd_create.o \
+ $(OBJDIR)/rrd_diff.o \
+ $(OBJDIR)/rrd_dump.o \
+ $(OBJDIR)/rrd_error.o \
+ $(OBJDIR)/rrd_fetch.o \
+ $(OBJDIR)/rrd_first.o \
+ $(OBJDIR)/rrd_format.o \
+ $(OBJDIR)/rrd_gfx.o \
+ $(OBJDIR)/rrd_graph.o \
+ $(OBJDIR)/rrd_graph_helper.o \
+ $(OBJDIR)/rrd_hw.o \
+ $(OBJDIR)/rrd_info.o \
+ $(OBJDIR)/rrd_last.o \
+ $(OBJDIR)/rrd_nan_inf.o \
+ $(OBJDIR)/rrd_open.o \
+ $(OBJDIR)/rrd_resize.o \
+ $(OBJDIR)/rrd_restore.o \
+ $(OBJDIR)/rrd_rpncalc.o \
+ $(OBJDIR)/rrd_tune.o \
+ $(OBJDIR)/rrd_update.o \
+ $(OBJDIR)/rrd_version.o \
+ $(OBJDIR)/rrd_xport.o \
+ $(OBJDIR)/rrd_thread_safe.o \
+ $(EOLIST)
+
+XLIBOBJS = \
+ $(OBJDIR)/art_rgba_svp.o \
+ $(OBJDIR)/getopt.o \
+ $(OBJDIR)/getopt1.o \
+ $(OBJDIR)/hash_32.o \
+ $(OBJDIR)/parsetime.o \
+ $(OBJDIR)/pngsize.o \
+ $(EOLIST)
+
+PNGLIBOBJS = \
+ $(OBJDIR)/png.o \
+ $(OBJDIR)/pngerror.o \
+ $(OBJDIR)/pngget.o \
+ $(OBJDIR)/pngmem.o \
+ $(OBJDIR)/pngpread.o \
+ $(OBJDIR)/pngread.o \
+ $(OBJDIR)/pngrio.o \
+ $(OBJDIR)/pngrtran.o \
+ $(OBJDIR)/pngrutil.o \
+ $(OBJDIR)/pngset.o \
+ $(OBJDIR)/pngtrans.o \
+ $(OBJDIR)/pngwio.o \
+ $(OBJDIR)/pngwrite.o \
+ $(OBJDIR)/pngwtran.o \
+ $(OBJDIR)/pngwutil.o \
+ $(EOLIST)
+ifeq "$(wildcard $(LIBPNG)/pnggccrd.c)" "$(LIBPNG)/pnggccrd.c"
+PNGLIBOBJS += \
+ $(OBJDIR)/pnggccrd.o \
+ $(OBJDIR)/pngvcrd.o \
+ $(EOLIST)
+endif
+
+ZLIBOBJS = \
+ $(OBJDIR)/adler32.o \
+ $(OBJDIR)/compress.o \
+ $(OBJDIR)/crc32.o \
+ $(OBJDIR)/deflate.o \
+ $(OBJDIR)/inflate.o \
+ $(OBJDIR)/inffast.o \
+ $(OBJDIR)/inftrees.o \
+ $(OBJDIR)/trees.o \
+ $(OBJDIR)/zutil.o \
+ $(EOLIST)
+ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c"
+ZLIBOBJS += \
+ $(OBJDIR)/infblock.o \
+ $(OBJDIR)/infcodes.o \
+ $(OBJDIR)/infutil.o \
+ $(EOLIST)
+endif
+
+ARTLIBOBJS = \
+ $(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))
+
+OBJS := $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
+OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o
+OBJTOOL := $(OBJS) $(OBJDIR)/rrd_tool.o
+
+LDLIBS += $(LIBFT2)/builds/netware/libc/libft2.$(LIBEXT)
+
+
+all: rrdtool rrdcgi
+
+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) $(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) $(PROOT)/config.h
+
+distclean: clean
+ -$(RM) -r $(DISTDIR)
+ -$(RM) $(ARCHIVE)
+
+$(OBJDIR):
+ @mkdir $@
+
+$(DISTDIR):
+ @mkdir $@
+
+$(OBJDIR)/%.o: %.c
+ @echo Compiling $<
+ @$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJDIR)/version.inc: $(PROOT)/configure.ac $(OBJDIR) $(PROOT)/src/get_ver.awk
+ @echo Creating $@
+ @$(AWK) -f $(PROOT)/src/get_ver.awk $< > $@
+
+$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc
+ @echo Linking $@
+ @-$(RM) $@
+ @$(LD) $(LDFLAGS) $(@:.$(CGIEXT)=.def)
+ifneq ($(CGIEXT),nlm)
+ifeq ($(LD),mwldnlm)
+ @$(FIXNLMN) $@
+endif
+endif
+
+$(OBJDIR)/rrdtool.nlm: $(OBJTOOL) $(OBJDIR)/rrdtool.def $(OBJDIR)/rrdtool.xdc
+ @echo Linking $@
+ @-$(RM) $@
+ @$(LD) $(LDFLAGS) $(@:.nlm=.def)
+
+$(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
+ @echo Creating $@
+ @-$(RM) $@
+ @$(AR) $(ARFLAGS) $@ $^
+
+$(OBJDIR)/%.xdc: Makefile
+ @echo Creating $@
+ @$(MPKXDC) $(XDCOPT) $@
+
+$(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) >> $@
+ @echo $(DL)# All your changes will be lost!!$(DL) >> $@
+ @echo $(DL)#$(DL) >> $@
+ @echo $(DL)copyright "$(COPYR)"$(DL) >> $@
+ @echo $(DL)description "$(DESCR)"$(DL) >> $@
+ @echo $(DL)version $(RRD_VERSION)$(DL) >> $@
+ifdef NLMTYPE
+ @echo $(DL)type $(NLMTYPE)$(DL) >> $@
+else
+ @echo $(DL)type 0$(DL) >> $@
+endif
+ifdef STACK
+ @echo $(DL)stack $(STACK)$(DL) >> $@
+endif
+ @echo $(DL)threadname "$(notdir $(@:.def=))"$(DL) >> $@
+ifdef SCREEN
+ @echo $(DL)screenname "$(SCREEN)"$(DL) >> $@
+else
+ @echo $(DL)screenname "DEFAULT"$(DL) >> $@
+endif
+ifeq ($(DB),DEBUG)
+ @echo $(DL)debug$(DL) >> $@
+endif
+ifeq ($(LIBARCH),CLIB)
+ @echo $(DL)start _Prelude$(DL) >> $@
+ @echo $(DL)exit _Stop$(DL) >> $@
+ @echo $(DL)import @$(NDK_ROOT)/nwsdk/imports/clib.imp$(DL) >> $@
+ @echo $(DL)import @$(NDK_ROOT)/nwsdk/imports/threads.imp$(DL) >> $@
+ @echo $(DL)import @$(NDK_ROOT)/nwsdk/imports/nlmlib.imp$(DL) >> $@
+ @echo $(DL)module clib$(DL) >> $@
+else
+ @echo $(DL)start _LibCPrelude$(DL) >> $@
+ @echo $(DL)exit _LibCPostlude$(DL) >> $@
+ @echo $(DL)check _LibCCheckUnload$(DL) >> $@
+ @echo $(DL)import @$(NDK_ROOT)/libc/imports/libc.imp$(DL) >> $@
+ @echo $(DL)import @$(NDK_ROOT)/libc/imports/netware.imp$(DL) >> $@
+ @echo $(DL)module libc$(DL) >> $@
+ @echo $(DL)pseudopreemption$(DL) >> $@
+ @echo $(DL)flag_on 64$(DL) >> $@
+endif
+ifeq ($(LDRING),0)
+ @echo $(DL)flag_on 16$(DL) >> $@
+endif
+ifeq ($(LDRING),3)
+ @echo $(DL)flag_on 512$(DL) >> $@
+endif
+ifdef XDCOPT
+ @echo $(DL)xdcdata $(@:.def=.xdc)$(DL) >> $@
+endif
+ifeq ($(LD),nlmconv)
+ @echo $(DL)input $(OBJS) $(LDLIBS)$(DL) >> $@
+ @echo $(DL)input $(PRELUDE)$(DL) >> $@
+ @echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
+endif
+
+$(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) >> $@
+ @echo $(DL)** All your changes will be lost!!$(DL) >> $@
+ @echo $(DL)*/$(DL) >> $@
+ @echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
+ @echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@
+ @echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@
+ @echo $(DL)#define NUMVERS $(RRD_NUMVERS)$(DL) >> $@
+ @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@
+ @echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
+ @echo $(DL)#define HAVE_FLOAT_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
+ @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
+ @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MATH_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MBSTOWCS 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MEMMOVE 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MKTIME 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SETLOCALE 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
+# @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SNPRINTF 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STDARG_H 1$(DL) >> $@
+ @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_STRDUP 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
+ @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_SYS_TYPES_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_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) >> $@
+ @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
+ifdef NO_NULL_REALLOC
+ @echo $(DL)#define NO_NULL_REALLOC 1$(DL) >> $@
+ @echo $(DL)#define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))$(DL) >> $@
+else
+ @echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
+endif
+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
+ @echo Creating $@
+ @echo $(DL)This is a binary distribution for NetWare platform.$(DL) > $@
+ @echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
+ @echo $(DL)Please download the complete RRDTool package for$(DL) >> $@
+ @echo $(DL)any further documentation:$(DL) >> $@
+ @echo $(DL)$(WWWURL)$(DL) >> $@
+
+help:
+ @echo $(DL)===========================================================$(DL)
+ @echo $(DL)Novell NDK Base = $(NDKBASE)$(DL)
+ @echo $(DL)libpng Source = $(LIBPNG)$(DL)
+ @echo $(DL)libart Source = $(LIBART)$(DL)
+ @echo $(DL)Freetype 2 SDK = $(LIBFT2)$(DL)
+ @echo $(DL)Zlib SDK = $(ZLIBSDK)$(DL)
+ @echo $(DL)===========================================================$(DL)
+ @echo $(DL)RRDTool $(RRD_VERSION_STR) - available targets are:$(DL)
+ @echo $(DL)$(MAKE) all$(DL)
+ @echo $(DL)$(MAKE) rrdtool$(DL)
+ @echo $(DL)$(MAKE) rrdcgi$(DL)
+ @echo $(DL)$(MAKE) librrd$(DL)
+ @echo $(DL)$(MAKE) clean$(DL)
+ @echo $(DL)$(MAKE) dist$(DL)
+ @echo $(DL)$(MAKE) distclean$(DL)
+ @echo $(DL)===========================================================$(DL)
+
+
diff --git a/src/Makefile.NetWare b/src/Makefile.NetWare
--- a/src/Makefile.NetWare
+++ /dev/null
@@ -1,494 +0,0 @@
-# Gnu Makefile for NetWare target * 17-Aug-2006
-# for use with gcc/nlmconv or Metrowerks CodeWarrior compiler
-# use with: make -f Makefile.NetWare [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)
-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
-#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
-
-# Set the extension used for rrdcgi.
-ifndef CGIEXT
-CGIEXT = nlm
-endif
-
-# Edit the path below to point to your Novell NDK.
-ifndef NDKBASE
-NDKBASE = c:/novell
-endif
-
-# Base for the lib sources
-ifndef LIBBASE
-LIBBASE = ../..
-endif
-# All library code is statically linked to avoid problems with other lib NLMs.
-# Edit the path below to point to your libpng sources or set environment var.
-ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.12
-endif
-# Edit the path below to point to your freetype sources or set environment var.
-ifndef LIBFT2
-LIBFT2 = $(LIBBASE)/freetype-2.2.1
-endif
-# Edit the path below to point to your libart sources or set environment var.
-ifndef LIBART
-LIBART = $(LIBBASE)/libart_lgpl-2.3.17
-endif
-# Edit the path below to point to your zlib sources or set environment var.
-ifndef ZLIBSDK
-ZLIBSDK = $(LIBBASE)/zlib-1.2.3
-endif
-
-# Edit the path below to point to your distribution folder.
-ifndef DISTDIR
-DISTDIR = rrdtool-$(RRD_VERSION_STR)-nw
-endif
-ARCHIVE = $(DISTDIR).zip
-
-# whatever...
-# NO_NULL_REALLOC = 1
-
-# Edit the var below to point to your lib architecture.
-ifndef LIBARCH
-# LIBARCH = CLIB
-LIBARCH = LIBC
-endif
-
-# The following line defines your compiler.
-ifdef METROWERKS
- CC = mwccnlm
-else
- CC = gcc
-endif
-# RM = rm -f
-CP = cp -afv
-# if you want to mark the target as MTSAFE you will need a tool for
-# generating the xdc data for the linker; here's a minimal tool:
-# http://www.gknw.net/development/prgtools/mkxdc.zip
-MPKXDC = mkxdc
-# CodeWarrior is too stupid to set the internal name properly when
-# the extension is not a NLM and not a registered type. So we need
-# to fix that after linking (since CGI isnt a known type - argh!):
-# http://www.gknw.net/development/prgtools/fixnlmname.zip
-FIXNLMN = fixnlmname #-q
-# Here you can find a native Win32 binary of the original awk:
-# http://www.gknw.net/development/prgtools/awk.zip
-AWK = awk
-ZIP = zip -qzR9
-
-# must be equal to DEBUG or NDEBUG
-DB = NDEBUG
-# DB = DEBUG
-# Optimization: -O<n> or debugging: -g
-ifeq ($(DB),NDEBUG)
- OPT = -O2
- OBJDIR = release
-else
- OPT = -g
- OBJDIR = debug
-endif
-
-# Include the version info retrieved from source.
--include $(OBJDIR)/version.inc
-
-# Global flags for all compilers
-CFLAGS = $(OPT) -D$(DB) -nostdinc -DNETWARE -DN_PLAT_NLM -D_POSIX_SOURCE
-CFLAGS += -DHAVE_CONFIG_H
-
-ifeq ($(CC),mwccnlm)
-LD = mwldnlm
-LDFLAGS = -nostdlib $^ $(PRELUDE) $(LDLIBS) -o $@ -commandfile
-AR = $(LD)
-ARFLAGS = -type library -w nocmdline $(OBJS) -o
-LIBEXT = lib
-CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
-CFLAGS += -relax_pointers
-#CFLAGS += -w on,nounused,nounusedexpr # -ansi strict
-ifeq ($(LIBARCH),LIBC)
- PRELUDE = $(SDK_LIBC)/imports/libcpre.o
- CFLAGS += -align 4
-else
- PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
- CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
- CFLAGS += -align 1
-endif
-else
-LD = nlmconv
-LDFLAGS = -T
-AR = ar
-ARFLAGS = -cq
-LIBEXT = a
-CFLAGS += -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
-CFLAGS += -Wall -Wno-unused # -pedantic
-ifeq ($(LIBARCH),LIBC)
- PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
-else
- PRELUDE = $(NDK_ROOT)/pre/prelude.o
- CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
-endif
-endif
-
-ifeq ($(findstring linux,$(OSTYPE)),linux)
-#include $(NDKBASE)/nlmconv/ncpfs.inc
-DL = '
-endif
-
-ifeq ($(MTSAFE),YES)
- XDCOPT = -n
-endif
-ifeq ($(MTSAFE),NO)
- XDCOPT = -u
-endif
-ifndef COPYR
- COPYR = Copyright (c) 2006 The Open Source Community.
-endif
-ifndef DESCR
- DESCR = $(notdir $(@:.def=)) Command Extension
-endif
-DESCR += ($(LIBARCH)) - $(CC) build
-
-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)
-
-ifeq ($(LIBARCH),LIBC)
- INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
-else
- INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
-endif
-
-CFLAGS += $(INCLUDES)
-
-vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
-
-RRDLIBOBJS = \
- $(OBJDIR)/rrd_afm.o \
- $(OBJDIR)/rrd_afm_data.o \
- $(OBJDIR)/rrd_create.o \
- $(OBJDIR)/rrd_diff.o \
- $(OBJDIR)/rrd_dump.o \
- $(OBJDIR)/rrd_error.o \
- $(OBJDIR)/rrd_fetch.o \
- $(OBJDIR)/rrd_first.o \
- $(OBJDIR)/rrd_format.o \
- $(OBJDIR)/rrd_gfx.o \
- $(OBJDIR)/rrd_graph.o \
- $(OBJDIR)/rrd_graph_helper.o \
- $(OBJDIR)/rrd_hw.o \
- $(OBJDIR)/rrd_info.o \
- $(OBJDIR)/rrd_last.o \
- $(OBJDIR)/rrd_nan_inf.o \
- $(OBJDIR)/rrd_open.o \
- $(OBJDIR)/rrd_resize.o \
- $(OBJDIR)/rrd_restore.o \
- $(OBJDIR)/rrd_rpncalc.o \
- $(OBJDIR)/rrd_tune.o \
- $(OBJDIR)/rrd_update.o \
- $(OBJDIR)/rrd_version.o \
- $(OBJDIR)/rrd_xport.o \
- $(OBJDIR)/rrd_thread_safe.o \
- $(EOLIST)
-
-XLIBOBJS = \
- $(OBJDIR)/art_rgba_svp.o \
- $(OBJDIR)/getopt.o \
- $(OBJDIR)/getopt1.o \
- $(OBJDIR)/hash_32.o \
- $(OBJDIR)/parsetime.o \
- $(OBJDIR)/pngsize.o \
- $(EOLIST)
-
-PNGLIBOBJS = \
- $(OBJDIR)/png.o \
- $(OBJDIR)/pngerror.o \
- $(OBJDIR)/pngget.o \
- $(OBJDIR)/pngmem.o \
- $(OBJDIR)/pngpread.o \
- $(OBJDIR)/pngread.o \
- $(OBJDIR)/pngrio.o \
- $(OBJDIR)/pngrtran.o \
- $(OBJDIR)/pngrutil.o \
- $(OBJDIR)/pngset.o \
- $(OBJDIR)/pngtrans.o \
- $(OBJDIR)/pngwio.o \
- $(OBJDIR)/pngwrite.o \
- $(OBJDIR)/pngwtran.o \
- $(OBJDIR)/pngwutil.o \
- $(EOLIST)
-ifeq "$(wildcard $(LIBPNG)/pnggccrd.c)" "$(LIBPNG)/pnggccrd.c"
-PNGLIBOBJS += \
- $(OBJDIR)/pnggccrd.o \
- $(OBJDIR)/pngvcrd.o \
- $(EOLIST)
-endif
-
-ZLIBOBJS = \
- $(OBJDIR)/adler32.o \
- $(OBJDIR)/compress.o \
- $(OBJDIR)/crc32.o \
- $(OBJDIR)/deflate.o \
- $(OBJDIR)/inflate.o \
- $(OBJDIR)/inffast.o \
- $(OBJDIR)/inftrees.o \
- $(OBJDIR)/trees.o \
- $(OBJDIR)/zutil.o \
- $(EOLIST)
-ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c"
-ZLIBOBJS += \
- $(OBJDIR)/infblock.o \
- $(OBJDIR)/infcodes.o \
- $(OBJDIR)/infutil.o \
- $(EOLIST)
-endif
-
-ARTLIBOBJS = \
- $(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))
-
-OBJS := $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
-OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o
-OBJTOOL := $(OBJS) $(OBJDIR)/rrd_tool.o
-
-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)
-
-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)
- @echo Creating $(ARCHIVE)
- @$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt
-
-clean:
- -$(RM) -r $(OBJDIR)
- -$(RM) config.h
-
-distclean: clean
- -$(RM) -r $(DISTDIR)
- -$(RM) $(ARCHIVE)
-
-$(OBJDIR):
- @mkdir $@
-
-$(DISTDIR):
- @mkdir $@
-
-$(OBJDIR)/%.o: %.c
- @echo Compiling $<
- @$(CC) $(CFLAGS) -c $< -o $@
-
-$(OBJDIR)/version.inc: ../configure.ac $(OBJDIR) get_ver.awk
- @echo Creating $@
- @$(AWK) -f get_ver.awk $< > $@
-
-$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc
- @echo Linking $@
- @-$(RM) $@
- @$(LD) $(LDFLAGS) $(@:.$(CGIEXT)=.def)
-ifneq ($(CGIEXT),nlm)
-ifeq ($(LD),mwldnlm)
- @$(FIXNLMN) $@
-endif
-endif
-
-$(OBJDIR)/rrdtool.nlm: $(OBJTOOL) $(OBJDIR)/rrdtool.def $(OBJDIR)/rrdtool.xdc
- @echo Linking $@
- @-$(RM) $@
- @$(LD) $(LDFLAGS) $(@:.nlm=.def)
-
-$(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
- @echo Creating $@
- @-$(RM) $@
- @$(AR) $(ARFLAGS) $@ $^
-
-$(OBJDIR)/%.xdc: Makefile.NetWare
- @echo Creating $@
- @$(MPKXDC) $(XDCOPT) $@
-
-$(OBJDIR)/%.def: Makefile.NetWare $(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) >> $@
- @echo $(DL)# All your changes will be lost!!$(DL) >> $@
- @echo $(DL)#$(DL) >> $@
- @echo $(DL)copyright "$(COPYR)"$(DL) >> $@
- @echo $(DL)description "$(DESCR)"$(DL) >> $@
- @echo $(DL)version $(RRD_VERSION)$(DL) >> $@
-ifdef NLMTYPE
- @echo $(DL)type $(NLMTYPE)$(DL) >> $@
-else
- @echo $(DL)type 0$(DL) >> $@
-endif
-ifdef STACK
- @echo $(DL)stack $(STACK)$(DL) >> $@
-endif
- @echo $(DL)threadname "$(notdir $(@:.def=))"$(DL) >> $@
-ifdef SCREEN
- @echo $(DL)screenname "$(SCREEN)"$(DL) >> $@
-else
- @echo $(DL)screenname "DEFAULT"$(DL) >> $@
-endif
-ifeq ($(DB),DEBUG)
- @echo $(DL)debug$(DL) >> $@
-endif
-ifeq ($(LIBARCH),CLIB)
- @echo $(DL)start _Prelude$(DL) >> $@
- @echo $(DL)exit _Stop$(DL) >> $@
- @echo $(DL)import @$(NDK_ROOT)/nwsdk/imports/clib.imp$(DL) >> $@
- @echo $(DL)import @$(NDK_ROOT)/nwsdk/imports/threads.imp$(DL) >> $@
- @echo $(DL)import @$(NDK_ROOT)/nwsdk/imports/nlmlib.imp$(DL) >> $@
- @echo $(DL)module clib$(DL) >> $@
-else
- @echo $(DL)start _LibCPrelude$(DL) >> $@
- @echo $(DL)exit _LibCPostlude$(DL) >> $@
- @echo $(DL)check _LibCCheckUnload$(DL) >> $@
- @echo $(DL)import @$(NDK_ROOT)/libc/imports/libc.imp$(DL) >> $@
- @echo $(DL)import @$(NDK_ROOT)/libc/imports/netware.imp$(DL) >> $@
- @echo $(DL)module libc$(DL) >> $@
- @echo $(DL)pseudopreemption$(DL) >> $@
- @echo $(DL)flag_on 64$(DL) >> $@
-endif
-ifeq ($(LDRING),0)
- @echo $(DL)flag_on 16$(DL) >> $@
-endif
-ifeq ($(LDRING),3)
- @echo $(DL)flag_on 512$(DL) >> $@
-endif
-ifdef XDCOPT
- @echo $(DL)xdcdata $(@:.def=.xdc)$(DL) >> $@
-endif
-ifeq ($(LD),nlmconv)
- @echo $(DL)input $(OBJS) $(LDLIBS)$(DL) >> $@
- @echo $(DL)input $(PRELUDE)$(DL) >> $@
- @echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
-endif
-
-config.h: Makefile.NetWare
- @echo Creating $@
- @echo $(DL)/* $@ for NetWare 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) >> $@
- @echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
- @echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@
- @echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@
- @echo $(DL)#define NUMVERS $(RRD_NUMVERS)$(DL) >> $@
- @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@
- @echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
- @echo $(DL)#define HAVE_FLOAT_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
- @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
- @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_MATH_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_MBSTOWCS 1$(DL) >> $@
- @echo $(DL)#define HAVE_MEMMOVE 1$(DL) >> $@
- @echo $(DL)#define HAVE_MKTIME 1$(DL) >> $@
- @echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
- @echo $(DL)#define HAVE_SETLOCALE 1$(DL) >> $@
- @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
-# @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
- @echo $(DL)#define HAVE_SNPRINTF 1$(DL) >> $@
- @echo $(DL)#define HAVE_STDARG_H 1$(DL) >> $@
- @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_STRDUP 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
- @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
- @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_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 STDC_HEADERS 1$(DL) >> $@
- @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
- @echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
-ifdef NO_NULL_REALLOC
- @echo $(DL)#define NO_NULL_REALLOC 1$(DL) >> $@
- @echo $(DL)#define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))$(DL) >> $@
-else
- @echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
-endif
- @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
- @echo $(DL)#define RRD_DEFAULT_FONT $(RRD_DEFAULT_FONT)$(DL) >> $@
-ifdef WITH_PIECHART
- @echo $(DL)#define WITH_PIECHART 1$(DL) >> $@
-endif
-
-$(DISTDIR)/readme.txt: Makefile.NetWare
- @echo Creating $@
- @echo $(DL)This is a binary distribution for NetWare platform.$(DL) > $@
- @echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
- @echo $(DL)Please download the complete RRDTool package for$(DL) >> $@
- @echo $(DL)any further documentation:$(DL) >> $@
- @echo $(DL)$(WWWURL)$(DL) >> $@
-
-help:
- @echo $(DL)===========================================================$(DL)
- @echo $(DL)Novell NDK Base = $(NDKBASE)$(DL)
- @echo $(DL)libpng Source = $(LIBPNG)$(DL)
- @echo $(DL)libart Source = $(LIBART)$(DL)
- @echo $(DL)Freetype 2 SDK = $(LIBFT2)$(DL)
- @echo $(DL)Zlib SDK = $(ZLIBSDK)$(DL)
- @echo $(DL)===========================================================$(DL)
- @echo $(DL)RRDTool $(RRD_VERSION_STR) - available targets are:$(DL)
- @echo $(DL)$(MAKE) all$(DL)
- @echo $(DL)$(MAKE) rrdtool$(DL)
- @echo $(DL)$(MAKE) rrdcgi$(DL)
- @echo $(DL)$(MAKE) librrd$(DL)
- @echo $(DL)$(MAKE) clean$(DL)
- @echo $(DL)$(MAKE) dist$(DL)
- @echo $(DL)$(MAKE) distclean$(DL)
- @echo $(DL)===========================================================$(DL)
-
-
diff --git a/src/Makefile.Win32 b/src/Makefile.Win32
--- a/src/Makefile.Win32
+++ /dev/null
@@ -1,408 +0,0 @@
-# Gnu Makefile for Win32 target * 17-Aug-2006
-# for use with MingW32 gcc or Metrowerks CodeWarrior compiler
-# use with: make -f Makefile.Win32 [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
-
-# Set the default font used in graphs.
-ifndef RRD_DEFAULT_FONT
-#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
-
-# Set the extension used for rrdcgi.
-ifndef CGIEXT
-CGIEXT = exe
-endif
-
-# Base for the lib sources
-ifndef LIBBASE
-LIBBASE = ../..
-endif
-# All library code is statically linked to avoid problems with other lib DLLs.
-# Edit the path below to point to your libpng sources or set environment var.
-ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.12
-endif
-# Edit the path below to point to your freetype sources or set environment var.
-ifndef LIBFT2
-#LIBFT2 = $(LIBBASE)/freetype-2.2.1
-LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.2.1
-endif
-# Edit the path below to point to your libart sources or set environment var.
-ifndef LIBART
-LIBART = $(LIBBASE)/libart_lgpl-2.3.17
-endif
-# Edit the path below to point to your zlib sources or set environment var.
-ifndef ZLIBSDK
-ZLIBSDK = $(LIBBASE)/zlib-1.2.3
-endif
-
-# Edit the path below to point to your distribution folder.
-ifndef DISTDIR
-DISTDIR = rrdtool-$(RRD_VERSION_STR)-w32
-endif
-ARCHIVE = $(DISTDIR).zip
-
-# whatever...
-NO_NULL_REALLOC = 1
-
-# The following line defines your compiler.
-ifdef METROWERKS
- CC = mwcc
-else
- CC = gcc
-endif
-# RM = rm -f
-CP = cp -afv
-# Here you can find a native Win32 binary of the original awk:
-# http://www.gknw.net/development/prgtools/awk.zip
-AWK = awk
-ZIP = zip -qzR9
-
-# must be equal to DEBUG or NDEBUG
-DB = NDEBUG
-# DB = DEBUG
-# Optimization: -O<n> or debugging: -g
-ifeq ($(DB),NDEBUG)
- OPT = -O2
- OBJDIR = release
-else
- OPT = -g
- OBJDIR = debug
-endif
-
-# Include the version info retrieved from source.
--include $(OBJDIR)/version.inc
-
-# Global flags for all compilers
-CFLAGS = $(OPT) -D$(DB) -DHAVE_CONFIG_H
-
-ifeq ($(CC),mwcc)
-LD = mwld
-RC = mwwinrc
-LDFLAGS = -nostdlib
-AR = $(LD)
-ARFLAGS = -type library -w nocmdline $(OBJS) -o
-LIBEXT = lib
-LIBPATH += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"
-LDLIBS += -lkernel32.lib -luser32.lib
-LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib
-RCFLAGS =
-CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 586
-CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"
-CFLAGS += -w on,nounused,nounusedexpr # -ansi strict
-else
-LD = gcc
-RC = windres
-LDFLAGS = -s
-AR = ar
-ARFLAGS = -cq
-LIBEXT = a
-RCFLAGS = -I rc -O coff -i
-CFLAGS += -fno-strict-aliasing -Wall -Wno-unused # -pedantic
-endif
-
-ifndef COPYR
- COPYR = Copyright (c) 2006 The Open Source Community.
-endif
-ifndef DESCR
- DESCR = $(notdir $(@:.rc=)) Command Extension
-endif
-DESCR += - $(CC) build
-
-INCLUDES += -I. -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
-
-CFLAGS += $(INCLUDES)
-
-vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
-
-RRDLIBOBJS = \
- $(OBJDIR)/rrd_afm.o \
- $(OBJDIR)/rrd_afm_data.o \
- $(OBJDIR)/rrd_create.o \
- $(OBJDIR)/rrd_diff.o \
- $(OBJDIR)/rrd_dump.o \
- $(OBJDIR)/rrd_error.o \
- $(OBJDIR)/rrd_fetch.o \
- $(OBJDIR)/rrd_first.o \
- $(OBJDIR)/rrd_format.o \
- $(OBJDIR)/rrd_gfx.o \
- $(OBJDIR)/rrd_graph.o \
- $(OBJDIR)/rrd_graph_helper.o \
- $(OBJDIR)/rrd_hw.o \
- $(OBJDIR)/rrd_info.o \
- $(OBJDIR)/rrd_last.o \
- $(OBJDIR)/rrd_nan_inf.o \
- $(OBJDIR)/rrd_open.o \
- $(OBJDIR)/rrd_resize.o \
- $(OBJDIR)/rrd_restore.o \
- $(OBJDIR)/rrd_rpncalc.o \
- $(OBJDIR)/rrd_tune.o \
- $(OBJDIR)/rrd_update.o \
- $(OBJDIR)/rrd_version.o \
- $(OBJDIR)/rrd_xport.o \
- $(OBJDIR)/rrd_thread_safe_nt.o \
- $(EOLIST)
-
-XLIBOBJS = \
- $(OBJDIR)/art_rgba_svp.o \
- $(OBJDIR)/getopt.o \
- $(OBJDIR)/getopt1.o \
- $(OBJDIR)/hash_32.o \
- $(OBJDIR)/parsetime.o \
- $(OBJDIR)/pngsize.o \
- $(OBJDIR)/strftime.o \
- $(EOLIST)
-
-PNGLIBOBJS = \
- $(OBJDIR)/png.o \
- $(OBJDIR)/pngerror.o \
- $(OBJDIR)/pngget.o \
- $(OBJDIR)/pngmem.o \
- $(OBJDIR)/pngpread.o \
- $(OBJDIR)/pngread.o \
- $(OBJDIR)/pngrio.o \
- $(OBJDIR)/pngrtran.o \
- $(OBJDIR)/pngrutil.o \
- $(OBJDIR)/pngset.o \
- $(OBJDIR)/pngtrans.o \
- $(OBJDIR)/pngwio.o \
- $(OBJDIR)/pngwrite.o \
- $(OBJDIR)/pngwtran.o \
- $(OBJDIR)/pngwutil.o \
- $(EOLIST)
-ifeq "$(wildcard $(LIBPNG)/pnggccrd.c)" "$(LIBPNG)/pnggccrd.c"
-PNGLIBOBJS += \
- $(OBJDIR)/pnggccrd.o \
- $(OBJDIR)/pngvcrd.o \
- $(EOLIST)
-endif
-
-ZLIBOBJS = \
- $(OBJDIR)/adler32.o \
- $(OBJDIR)/compress.o \
- $(OBJDIR)/crc32.o \
- $(OBJDIR)/deflate.o \
- $(OBJDIR)/inflate.o \
- $(OBJDIR)/inffast.o \
- $(OBJDIR)/inftrees.o \
- $(OBJDIR)/trees.o \
- $(OBJDIR)/zutil.o \
- $(EOLIST)
-ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c"
-ZLIBOBJS += \
- $(OBJDIR)/infblock.o \
- $(OBJDIR)/infcodes.o \
- $(OBJDIR)/infutil.o \
- $(EOLIST)
-endif
-
-ARTLIBOBJS = \
- $(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))
-
-OBJS := $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
-OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o
-OBJTOOL := $(OBJS) $(OBJDIR)/rrd_tool.o
-
-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)
-
-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)
- @echo Creating $(ARCHIVE)
- @$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt
-
-clean:
- -$(RM) -r $(OBJDIR)
- -$(RM) config.h
-
-distclean: clean
- -$(RM) -r $(DISTDIR)
- -$(RM) $(ARCHIVE)
-
-$(OBJDIR):
- @mkdir $@
-
-$(DISTDIR):
- @mkdir $@
-
-$(OBJDIR)/version.inc: ../configure.ac $(OBJDIR) get_ver.awk
- @echo Creating $@
- @$(AWK) -f get_ver.awk $< > $@
-
-$(OBJDIR)/%.o: %.c
- @echo Compiling $<
- @$(CC) $(CFLAGS) -c $< -o $@
-
-$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.res
- @echo Linking $@
- @-$(RM) $@
- @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)
-
-$(OBJDIR)/rrdtool.exe: $(OBJTOOL) $(OBJDIR)/rrdtool.res
- @echo Linking $@
- @-$(RM) $@
- @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)
-
-$(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
- @echo Creating $@
- @-$(RM) $@
- @$(AR) $(ARFLAGS) $@ $^
-
-$(OBJDIR)/%.res: $(OBJDIR)/%.rc
- @echo Creating $@
- @$(RC) $(RCFLAGS) $< -o $@
-
-$(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc
- @echo 1 VERSIONINFO > $@
- @echo FILEVERSION $(RRD_VERSION),0 >> $@
- @echo PRODUCTVERSION $(RRD_VERSION),0 >> $@
- @echo FILEFLAGSMASK 0x3fL >> $@
- @echo FILEOS 0x40004L >> $@
- @echo FILEFLAGS 0x0L >> $@
- @echo FILETYPE 0x1L >> $@
- @echo FILESUBTYPE 0x0L >> $@
- @echo BEGIN >> $@
- @echo BLOCK "StringFileInfo" >> $@
- @echo BEGIN >> $@
- @echo BLOCK "040904E4" >> $@
- @echo BEGIN >> $@
- @echo VALUE "LegalCopyright","$(COPYR)\0" >> $@
-ifdef COMPANY
- @echo VALUE "CompanyName","$(COMPANY)\0" >> $@
-endif
- @echo VALUE "ProductName","$(notdir $(@:.rc=.exe))\0" >> $@
- @echo VALUE "ProductVersion","$(RRD_VERSION_STR)\0" >> $@
- @echo VALUE "License","Released under GPL.\0" >> $@
- @echo VALUE "FileDescription","$(DESCR)\0" >> $@
- @echo VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@
- @echo VALUE "InternalName","$(notdir $(@:.rc=))\0" >> $@
- @echo VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0" >> $@
- @echo VALUE "WWW","$(WWWURL)\0" >> $@
- @echo END >> $@
- @echo END >> $@
- @echo BLOCK "VarFileInfo" >> $@
- @echo BEGIN >> $@
- @echo VALUE "Translation", 0x409, 1252 >> $@
- @echo END >> $@
- @echo END >> $@
-ifdef ICON
- @echo 1 ICON DISCARDABLE "$(ICON)" >> $@
-endif
-
-config.h: Makefile.Win32 $(OBJDIR)/version.inc
- @echo Creating $@
- @echo $(DL)/* $@ for NetWare 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) >> $@
- @echo $(DL)#define OS "i586-pc-Win32"$(DL) >> $@
- @echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@
- @echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@
- @echo $(DL)#define NUMVERS $(RRD_NUMVERS)$(DL) >> $@
- @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@
- @echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
-# @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
- @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
- @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_MATH_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_MBSTOWCS 1$(DL) >> $@
- @echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
- @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
-# @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
- @echo $(DL)#define HAVE_SNPRINTF 1$(DL) >> $@
- @echo $(DL)#define HAVE_STDARG_H 1$(DL) >> $@
- @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_STRDUP 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
- @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
-# @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
- @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 STDC_HEADERS 1$(DL) >> $@
- @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
- @echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@
- @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
-ifdef NO_NULL_REALLOC
- @echo $(DL)#define NO_NULL_REALLOC 1$(DL) >> $@
- @echo $(DL)#define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))$(DL) >> $@
-else
- @echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
-endif
- @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
- @echo $(DL)#define RRD_DEFAULT_FONT $(RRD_DEFAULT_FONT)$(DL) >> $@
- @echo $(DL)#define strftime strftime_$(DL) >> $@
-ifdef WITH_PIECHART
- @echo $(DL)#define WITH_PIECHART 1$(DL) >> $@
-endif
-
-$(DISTDIR)/readme.txt: Makefile.Win32
- @echo Creating $@
- @echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@
- @echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
- @echo $(DL)Please download the complete RRDTool package for$(DL) >> $@
- @echo $(DL)any further documentation:$(DL) >> $@
- @echo $(DL)$(WWWURL)$(DL) >> $@
-
-help:
- @echo $(DL)===========================================================$(DL)
- @echo $(DL)libpng Source = $(LIBPNG)$(DL)
- @echo $(DL)libart Source = $(LIBART)$(DL)
- @echo $(DL)Freetype 2 SDK = $(LIBFT2)$(DL)
- @echo $(DL)Zlib SDK = $(ZLIBSDK)$(DL)
- @echo $(DL)===========================================================$(DL)
- @echo $(DL)RRDTool $(RRD_VERSION_STR) - available targets are:$(DL)
- @echo $(DL)$(MAKE) all$(DL)
- @echo $(DL)$(MAKE) rrdtool$(DL)
- @echo $(DL)$(MAKE) rrdcgi$(DL)
- @echo $(DL)$(MAKE) librrd$(DL)
- @echo $(DL)$(MAKE) clean$(DL)
- @echo $(DL)$(MAKE) dist$(DL)
- @echo $(DL)$(MAKE) distclean$(DL)
- @echo $(DL)===========================================================$(DL)
-
-
diff --git a/src/rrd.dsp b/src/rrd.dsp
--- a/src/rrd.dsp
+++ /dev/null
@@ -1,198 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rrd" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=rrd - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "rrd.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "rrd.mak" CFG="rrd - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "rrd - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "rrd - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "rrd - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "rrd___Wi"
-# PROP BASE Intermediate_Dir "rrd___Wi"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "release"
-# 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
-# SUBTRACT CPP /X /YX
-# ADD BASE RSC /l 0x100c
-# ADD RSC /l 0x100c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "rrd - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "rrd___W0"
-# PROP BASE Intermediate_Dir "rrd___W0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "debug"
-# 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
-# SUBTRACT CPP /X /YX
-# ADD BASE RSC /l 0x100c
-# ADD RSC /l 0x100c
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o"rrd.bsc"
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "rrd - Win32 Release"
-# Name "rrd - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\hash_32.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\parsetime.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pngsize.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_afm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_afm_data.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_create.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_diff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_dump.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_error.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_fetch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_format.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_gfx.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_graph.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_graph_helper.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_hw.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_info.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_last.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_nan_inf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_open.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_resize.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_restore.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_rpncalc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_thread_safe_nt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_tune.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_update.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rrd_xport.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/rrd.vcproj b/src/rrd.vcproj
--- a/src/rrd.vcproj
+++ /dev/null
@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="rrd"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\release"
- IntermediateDirectory=".\release"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="4"
- AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CTYPE_DISABLE_MACROS"
- RuntimeLibrary="2"
- PrecompiledHeaderFile=".\release/rrd.pch"
- AssemblerListingLocation=".\release/"
- ObjectFile=".\release/"
- ProgramDataBaseFileName=".\release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\release\rrd.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="4108"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\debug"
- IntermediateDirectory=".\debug"
- ConfigurationType="4"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CTYPE_DISABLE_MACROS"
- RuntimeLibrary="2"
- PrecompiledHeaderFile=".\debug/rrd.pch"
- AssemblerListingLocation=".\debug/"
- ObjectFile=".\debug/"
- ProgramDataBaseFileName=".\debug/"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLibrarianTool"
- OutputFile=".\debug\rrd.lib"
- SuppressStartupBanner="TRUE"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- Culture="4108"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="getopt.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="getopt1.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="hash_32.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="parsetime.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="pngsize.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_afm.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_afm_data.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_create.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_diff.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_dump.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_error.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_fetch.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_format.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_gfx.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_graph.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_graph_helper.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_hw.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_info.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_last.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_nan_inf.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_open.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_resize.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_restore.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_rpncalc.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_thread_safe_nt.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_tune.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_update.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="rrd_xport.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/rrd_afm.c b/src/rrd_afm.c
index 99a13b720ab58d5ff26bb56b0a85395cc9dc9d8e..f7eea892fc58492b44cd565677f61e9821efd5ec 100644 (file)
--- a/src/rrd_afm.c
+++ b/src/rrd_afm.c
****************************************************************************/
#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 8067870e612b205565d97de55fce900e90346b59..aad09502d3f86c2b4dd2f553f755a0ad3adf666c 100644 (file)
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
#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 11a4e287eb0852d2a1ccbc152431e27d03445947..a1393459ab882e56700f2d8ca4f12d308fbf5301 100644 (file)
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
/* #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 ecf19fd31f2d579a8e59792ae6bb47716170749b..a16734ba4175faa76240e2c66ad7d9e4104a7305 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
#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 2d983a4e6b66b89d086fa1a056664cfb00e0885d..c554099dd125469a03b8f8343d497fcbe32be05d 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
#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.dsp b/src/rrdtool.dsp
--- a/src/rrdtool.dsp
+++ /dev/null
@@ -1,92 +0,0 @@
-# Microsoft Developer Studio Project File - Name="rrdtool" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=rrdtool - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "rrdtool.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "rrdtool.mak" CFG="rrdtool - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "rrdtool - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "rrdtool - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "rrdtool - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "rrdtool_"
-# PROP BASE Intermediate_Dir "rrdtool_"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "toolrelease"
-# PROP Intermediate_Dir "toolrelease"
-# 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
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x100c /d "NDEBUG"
-# ADD RSC /l 0x100c /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"
-
-!ELSEIF "$(CFG)" == "rrdtool - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "rrdtool0"
-# PROP BASE Intermediate_Dir "rrdtool0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "tooldebug"
-# PROP Intermediate_Dir "tooldebug"
-# 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
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x100c /d "_DEBUG"
-# ADD RSC /l 0x100c /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"
-
-!ENDIF
-
-# Begin Target
-
-# Name "rrdtool - Win32 Release"
-# Name "rrdtool - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\rrd_tool.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/rrdtool.dsw b/src/rrdtool.dsw
--- a/src/rrdtool.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "rrdtool"=".\rrdtool.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name rrd
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/src/rrdtool.sln b/src/rrdtool.sln
--- 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/rrdtool.vcproj b/src/rrdtool.vcproj
--- a/src/rrdtool.vcproj
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="rrdtool"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\toolrelease"
- IntermediateDirectory=".\toolrelease"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="4"
- AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
- PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;_CTYPE_DISABLE_MACROS"
- RuntimeLibrary="2"
- PrecompiledHeaderFile=".\toolrelease/rrdtool.pch"
- AssemblerListingLocation=".\toolrelease/"
- ObjectFile=".\toolrelease/"
- ProgramDataBaseFileName=".\toolrelease/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libpng.lib libz.lib libart_lgpl.lib libfreetype.lib"
- OutputFile=".\toolrelease/rrdtool.exe"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="\Program Files\GnuWin32\lib"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\toolrelease/rrdtool.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\toolrelease/rrdtool.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="4108"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\tooldebug"
- IntermediateDirectory=".\tooldebug"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
- PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_CTYPE_DISABLE_MACROS"
- RuntimeLibrary="2"
- PrecompiledHeaderFile=".\tooldebug/rrdtool.pch"
- AssemblerListingLocation=".\tooldebug/"
- ObjectFile=".\tooldebug/"
- ProgramDataBaseFileName=".\tooldebug/"
- BrowseInformation="1"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libpng.lib libz.lib libart_lgpl.lib libfreetype.lib"
- OutputFile=".\tooldebug/rrdtool.exe"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="\Program Files\GnuWin32\lib"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\tooldebug/rrdtool.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\tooldebug/rrdtool.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="4108"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="rrd_tool.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/src/win32comp.c b/src/win32comp.c
index 590e4787c6b8ec9221f97b9bb5b8bdc0b1d7e272..32f533726225bfa9b5c05efc0d897c0af53a8d76 100644 (file)
--- a/src/win32comp.c
+++ b/src/win32comp.c
-// compatibility routines, non reentrant ....\r
-\r
-#include <string.h> \r
-#include <time.h>\r
-\r
-struct tm* localtime_r(const time_t* t, struct tm* r) {\r
- struct tm * temp;\r
- temp = localtime(t);\r
- memcpy(r,temp,sizeof(struct tm));\r
- return(r);\r
-}\r
-\r
-struct tm* gmtime_r(const time_t* t, struct tm* r) {\r
- struct tm * temp;\r
- temp = gmtime(t);\r
- memcpy(r,temp,sizeof(struct tm));\r
- return r;\r
-}\r
-\r
-char* ctime_r (const time_t* t, char* buf) {\r
- char * temp;\r
- temp = asctime(localtime(t));\r
- strcpy(buf,temp);\r
- return(buf);\r
-}\r
-\r
-/*\r
- s \r
- Points to the string from which to extract tokens. \r
-\r
- delim \r
- Points to a null-terminated set of delimiter characters. \r
-\r
- save_ptr\r
- Is a value-return parameter used by strtok_r() to record its progress through s1. \r
-*/\r
-\r
-\r
-char * strtok_r (char *s, const char *delim, char **save_ptr) {\r
- char *token;\r
-\r
- if (s == NULL) s = *save_ptr;\r
-\r
- /* Scan leading delimiters. */\r
- s += strspn(s, delim);\r
- if (*s == '\0')\r
- {\r
- *save_ptr = s;\r
- return NULL;\r
- }\r
-\r
- /* Find the end of the token. */\r
- token = s;\r
- s = strpbrk (token, delim);\r
- if (s == NULL) {\r
- /* This token finishes the string. */\r
- *save_ptr = token;\r
- while (**save_ptr != '\0') (*save_ptr)++;\r
- } else\r
- {\r
- /* Terminate the token and make *SAVE_PTR point past it. */\r
- *s = '\0';\r
- *save_ptr = s + 1;\r
- }\r
- return token;\r
-}\r
-\r
+// 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/win32/Makefile b/win32/Makefile
--- /dev/null
+++ b/win32/Makefile
@@ -0,0 +1,410 @@
+# Gnu Makefile for Win32 target * 25-Aug-2006
+# for use with MingW32 gcc or Metrowerks CodeWarrior compiler
+# 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://www.rrdtool.org/
+ICON = $(PROOT)/favicon.ico
+
+# 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 = "VeraMono.ttf"
+
+# 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 = 0
+
+# Set the extension used for rrdcgi.
+ifndef CGIEXT
+CGIEXT = exe
+endif
+
+# Base for the lib sources
+ifndef LIBBASE
+LIBBASE = ../..
+endif
+# All library code is statically linked to avoid problems with other lib DLLs.
+# Edit the path below to point to your libpng sources or set environment var.
+ifndef LIBPNG
+LIBPNG = $(LIBBASE)/libpng-1.2.12
+endif
+# Edit the path below to point to your freetype sources or set environment var.
+ifndef LIBFT2
+#LIBFT2 = $(LIBBASE)/freetype-2.2.1
+LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.2.1
+endif
+# Edit the path below to point to your libart sources or set environment var.
+ifndef LIBART
+LIBART = $(LIBBASE)/libart_lgpl-2.3.17
+endif
+# Edit the path below to point to your zlib sources or set environment var.
+ifndef ZLIBSDK
+ZLIBSDK = $(LIBBASE)/zlib-1.2.3
+endif
+
+# Edit the path below to point to your distribution folder.
+ifndef DISTDIR
+DISTDIR = rrdtool-$(RRD_VERSION_STR)-w32
+endif
+ARCHIVE = $(DISTDIR).zip
+
+# whatever...
+NO_NULL_REALLOC = 1
+
+# The following line defines your compiler.
+ifdef METROWERKS
+ CC = mwcc
+else
+ CC = gcc
+endif
+# RM = rm -f
+CP = cp -afv
+# Here you can find a native Win32 binary of the original awk:
+# http://www.gknw.net/development/prgtools/awk.zip
+AWK = awk
+ZIP = zip -qzR9
+
+# must be equal to DEBUG or NDEBUG
+DB = NDEBUG
+# DB = DEBUG
+# Optimization: -O<n> or debugging: -g
+ifeq ($(DB),NDEBUG)
+ OPT = -O2
+ OBJDIR = release
+else
+ OPT = -g
+ OBJDIR = debug
+endif
+
+# Project root
+PROOT = ..
+
+# Include the version info retrieved from source.
+-include $(OBJDIR)/version.inc
+
+# Global flags for all compilers
+CFLAGS = $(OPT) -D$(DB) -DHAVE_CONFIG_H
+
+ifeq ($(CC),mwcc)
+LD = mwld
+RC = mwwinrc
+LDFLAGS = -nostdlib
+AR = $(LD)
+ARFLAGS = -type library -w nocmdline $(OBJS) -o
+LIBEXT = lib
+LIBPATH += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"
+LDLIBS += -lkernel32.lib -luser32.lib
+LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib
+RCFLAGS =
+CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 586
+CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"
+CFLAGS += -w on,nounused,nounusedexpr # -ansi strict
+else
+LD = gcc
+RC = windres
+LDFLAGS = -s
+AR = ar
+ARFLAGS = -cq
+LIBEXT = a
+RCFLAGS = -I rc -O coff -i
+CFLAGS += -fno-strict-aliasing -Wall -Wno-unused # -pedantic
+endif
+
+ifndef COPYR
+ COPYR = Copyright (c) 2006 The Open Source Community.
+endif
+ifndef DESCR
+ DESCR = $(notdir $(@:.rc=)) Command Extension
+endif
+DESCR += - $(CC) build
+
+INCLUDES += -I$(PROOT) -I$(PROOT)/src -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
+
+CFLAGS += $(INCLUDES)
+
+vpath %.c $(PROOT)/src $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK)
+
+RRDLIBOBJS = \
+ $(OBJDIR)/rrd_afm.o \
+ $(OBJDIR)/rrd_afm_data.o \
+ $(OBJDIR)/rrd_create.o \
+ $(OBJDIR)/rrd_diff.o \
+ $(OBJDIR)/rrd_dump.o \
+ $(OBJDIR)/rrd_error.o \
+ $(OBJDIR)/rrd_fetch.o \
+ $(OBJDIR)/rrd_first.o \
+ $(OBJDIR)/rrd_format.o \
+ $(OBJDIR)/rrd_gfx.o \
+ $(OBJDIR)/rrd_graph.o \
+ $(OBJDIR)/rrd_graph_helper.o \
+ $(OBJDIR)/rrd_hw.o \
+ $(OBJDIR)/rrd_info.o \
+ $(OBJDIR)/rrd_last.o \
+ $(OBJDIR)/rrd_nan_inf.o \
+ $(OBJDIR)/rrd_open.o \
+ $(OBJDIR)/rrd_resize.o \
+ $(OBJDIR)/rrd_restore.o \
+ $(OBJDIR)/rrd_rpncalc.o \
+ $(OBJDIR)/rrd_tune.o \
+ $(OBJDIR)/rrd_update.o \
+ $(OBJDIR)/rrd_version.o \
+ $(OBJDIR)/rrd_xport.o \
+ $(OBJDIR)/rrd_thread_safe_nt.o \
+ $(EOLIST)
+
+XLIBOBJS = \
+ $(OBJDIR)/art_rgba_svp.o \
+ $(OBJDIR)/getopt.o \
+ $(OBJDIR)/getopt1.o \
+ $(OBJDIR)/hash_32.o \
+ $(OBJDIR)/parsetime.o \
+ $(OBJDIR)/pngsize.o \
+ $(OBJDIR)/strftime.o \
+ $(EOLIST)
+
+PNGLIBOBJS = \
+ $(OBJDIR)/png.o \
+ $(OBJDIR)/pngerror.o \
+ $(OBJDIR)/pngget.o \
+ $(OBJDIR)/pngmem.o \
+ $(OBJDIR)/pngpread.o \
+ $(OBJDIR)/pngread.o \
+ $(OBJDIR)/pngrio.o \
+ $(OBJDIR)/pngrtran.o \
+ $(OBJDIR)/pngrutil.o \
+ $(OBJDIR)/pngset.o \
+ $(OBJDIR)/pngtrans.o \
+ $(OBJDIR)/pngwio.o \
+ $(OBJDIR)/pngwrite.o \
+ $(OBJDIR)/pngwtran.o \
+ $(OBJDIR)/pngwutil.o \
+ $(EOLIST)
+ifeq "$(wildcard $(LIBPNG)/pnggccrd.c)" "$(LIBPNG)/pnggccrd.c"
+PNGLIBOBJS += \
+ $(OBJDIR)/pnggccrd.o \
+ $(OBJDIR)/pngvcrd.o \
+ $(EOLIST)
+endif
+
+ZLIBOBJS = \
+ $(OBJDIR)/adler32.o \
+ $(OBJDIR)/compress.o \
+ $(OBJDIR)/crc32.o \
+ $(OBJDIR)/deflate.o \
+ $(OBJDIR)/inflate.o \
+ $(OBJDIR)/inffast.o \
+ $(OBJDIR)/inftrees.o \
+ $(OBJDIR)/trees.o \
+ $(OBJDIR)/zutil.o \
+ $(EOLIST)
+ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c"
+ZLIBOBJS += \
+ $(OBJDIR)/infblock.o \
+ $(OBJDIR)/infcodes.o \
+ $(OBJDIR)/infutil.o \
+ $(EOLIST)
+endif
+
+ARTLIBOBJS = \
+ $(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))
+
+OBJS := $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
+OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o
+OBJTOOL := $(OBJS) $(OBJDIR)/rrd_tool.o
+
+LDLIBS += $(LIBFT2)/objs/freetype.$(LIBEXT)
+
+
+all: rrdtool rrdcgi
+
+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) $(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) $(PROOT)/config.h
+
+distclean: clean
+ -$(RM) -r $(DISTDIR)
+ -$(RM) $(ARCHIVE)
+
+$(OBJDIR):
+ @mkdir $@
+
+$(DISTDIR):
+ @mkdir $@
+
+$(OBJDIR)/version.inc: $(PROOT)/configure.ac $(OBJDIR) $(PROOT)/src/get_ver.awk
+ @echo Creating $@
+ @$(AWK) -f $(PROOT)/src/get_ver.awk $< > $@
+
+$(OBJDIR)/%.o: %.c
+ @echo Compiling $<
+ @$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.res
+ @echo Linking $@
+ @-$(RM) $@
+ @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)
+
+$(OBJDIR)/rrdtool.exe: $(OBJTOOL) $(OBJDIR)/rrdtool.res
+ @echo Linking $@
+ @-$(RM) $@
+ @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)
+
+$(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
+ @echo Creating $@
+ @-$(RM) $@
+ @$(AR) $(ARFLAGS) $@ $^
+
+$(OBJDIR)/%.res: $(OBJDIR)/%.rc
+ @echo Creating $@
+ @$(RC) $(RCFLAGS) $< -o $@
+
+$(OBJDIR)/%.rc: Makefile $(OBJDIR)/version.inc
+ @echo 1 VERSIONINFO > $@
+ @echo FILEVERSION $(RRD_VERSION),0 >> $@
+ @echo PRODUCTVERSION $(RRD_VERSION),0 >> $@
+ @echo FILEFLAGSMASK 0x3fL >> $@
+ @echo FILEOS 0x40004L >> $@
+ @echo FILEFLAGS 0x0L >> $@
+ @echo FILETYPE 0x1L >> $@
+ @echo FILESUBTYPE 0x0L >> $@
+ @echo BEGIN >> $@
+ @echo BLOCK "StringFileInfo" >> $@
+ @echo BEGIN >> $@
+ @echo BLOCK "040904E4" >> $@
+ @echo BEGIN >> $@
+ @echo VALUE "LegalCopyright","$(COPYR)\0" >> $@
+ifdef COMPANY
+ @echo VALUE "CompanyName","$(COMPANY)\0" >> $@
+endif
+ @echo VALUE "ProductName","$(notdir $(@:.rc=.exe))\0" >> $@
+ @echo VALUE "ProductVersion","$(RRD_VERSION_STR)\0" >> $@
+ @echo VALUE "License","Released under GPL.\0" >> $@
+ @echo VALUE "FileDescription","$(DESCR)\0" >> $@
+ @echo VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@
+ @echo VALUE "InternalName","$(notdir $(@:.rc=))\0" >> $@
+ @echo VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0" >> $@
+ @echo VALUE "WWW","$(WWWURL)\0" >> $@
+ @echo END >> $@
+ @echo END >> $@
+ @echo BLOCK "VarFileInfo" >> $@
+ @echo BEGIN >> $@
+ @echo VALUE "Translation", 0x409, 1252 >> $@
+ @echo END >> $@
+ @echo END >> $@
+ifdef ICON
+ @echo 10 ICON DISCARDABLE "$(ICON)" >> $@
+endif
+
+$(PROOT)/config.h: Makefile $(OBJDIR)/version.inc
+ @echo Creating $@
+ @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) >> $@
+ @echo $(DL)#define OS "i586-pc-Win32"$(DL) >> $@
+ @echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@
+ @echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@
+ @echo $(DL)#define NUMVERS $(RRD_NUMVERS)$(DL) >> $@
+ @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@
+ @echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@
+# @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@
+ @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@
+ @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MATH_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_MBSTOWCS 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
+# @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
+ @echo $(DL)#define HAVE_SNPRINTF 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STDARG_H 1$(DL) >> $@
+ @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_STRDUP 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
+ @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
+# @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
+ @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_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) >> $@
+ @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
+ifdef NO_NULL_REALLOC
+ @echo $(DL)#define NO_NULL_REALLOC 1$(DL) >> $@
+ @echo $(DL)#define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))$(DL) >> $@
+else
+ @echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
+endif
+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
+ @echo Creating $@
+ @echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@
+ @echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
+ @echo $(DL)Please download the complete RRDTool package for$(DL) >> $@
+ @echo $(DL)any further documentation:$(DL) >> $@
+ @echo $(DL)$(WWWURL)$(DL) >> $@
+
+help:
+ @echo $(DL)===========================================================$(DL)
+ @echo $(DL)libpng Source = $(LIBPNG)$(DL)
+ @echo $(DL)libart Source = $(LIBART)$(DL)
+ @echo $(DL)Freetype 2 SDK = $(LIBFT2)$(DL)
+ @echo $(DL)Zlib SDK = $(ZLIBSDK)$(DL)
+ @echo $(DL)===========================================================$(DL)
+ @echo $(DL)RRDTool $(RRD_VERSION_STR) - available targets are:$(DL)
+ @echo $(DL)$(MAKE) all$(DL)
+ @echo $(DL)$(MAKE) rrdtool$(DL)
+ @echo $(DL)$(MAKE) rrdcgi$(DL)
+ @echo $(DL)$(MAKE) librrd$(DL)
+ @echo $(DL)$(MAKE) clean$(DL)
+ @echo $(DL)$(MAKE) dist$(DL)
+ @echo $(DL)$(MAKE) distclean$(DL)
+ @echo $(DL)===========================================================$(DL)
+
+
diff --git a/win32/config.h b/win32/config.h
--- /dev/null
+++ b/win32/config.h
@@ -0,0 +1,60 @@
+/* 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 */
+
+#define HAVE_STRFTIME 1
+#define HAVE_TIME_H 1
+#define HAVE_LOCALE_H 1
+#define HAVE_TZSET 1
+#define HAVE_SETLOCALE 1
+#define HAVE_MATH_H 1
+#define HAVE_FLOAT_H 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MKTIME 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRING_H 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+#define NUMVERS 1.2015
+#define PACKAGE_NAME "rrdtool"
+#define PACKAGE_VERSION "1.2.15"
+#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
+
+#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
+#define isnan _isnan
+#define finite _finite
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+#define strftime strftime_
+
+#define NO_NULL_REALLOC 1
+#if NO_NULL_REALLOC
+# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
+#else
+# define rrd_realloc(a,b) realloc((a), (b))
+#endif
+
+/* Vertical label angle: 90.0 (default) or 270.0 */
+#define RRDGRAPH_YLEGEND_ANGLE 90.0
+
+#define RRD_DEFAULT_FONT "arial.ttf"
+/* #define RRD_DEFAULT_FONT "DejaVuSansMono-Roman.ttf" */
+
+/* #define WITH_PIECHART 1 */
+
+/* #define DEBUG 1 */
+
+#endif /* CONFIG_H */
+
diff --git a/win32/rrd.dsp b/win32/rrd.dsp
--- /dev/null
+++ b/win32/rrd.dsp
@@ -0,0 +1,214 @@
+# Microsoft Developer Studio Project File - Name="rrd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=rrd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "rrd.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "rrd.mak" CFG="rrd - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "rrd - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "rrd - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "rrd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "rrd___Wi"
+# PROP BASE Intermediate_Dir "rrd___Wi"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# 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 "../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 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "rrd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "rrd___W0"
+# PROP BASE Intermediate_Dir "rrd___W0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# 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 "../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 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo /o"rrd.bsc"
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "rrd - Win32 Release"
+# Name "rrd - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\src\rrd_afm.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_afm_data.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_diff.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_dump.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_error.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_fetch.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_first.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_format.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_gfx.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_graph.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_graph_helper.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_hw.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_info.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_last.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_nan_inf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_open.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_resize.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_restore.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_rpncalc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_thread_safe_nt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_tune.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_update.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_version.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\rrd_xport.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\art_rgba_svp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\getopt.c
+# End Source File
+# Begin Source File
+
+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/win32/rrd.vcproj b/win32/rrd.vcproj
--- /dev/null
+++ b/win32/rrd.vcproj
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="rrd"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\release"
+ IntermediateDirectory=".\release"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="4"
+ AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CTYPE_DISABLE_MACROS"
+ RuntimeLibrary="2"
+ PrecompiledHeaderFile=".\release/rrd.pch"
+ AssemblerListingLocation=".\release/"
+ ObjectFile=".\release/"
+ ProgramDataBaseFileName=".\release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\release\rrd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="4108"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\debug"
+ IntermediateDirectory=".\debug"
+ ConfigurationType="4"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CTYPE_DISABLE_MACROS"
+ RuntimeLibrary="2"
+ PrecompiledHeaderFile=".\debug/rrd.pch"
+ AssemblerListingLocation=".\debug/"
+ ObjectFile=".\debug/"
+ ProgramDataBaseFileName=".\debug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile=".\debug\rrd.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ Culture="4108"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="getopt.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="getopt1.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="hash_32.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="parsetime.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="pngsize.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_afm.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_afm_data.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_create.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_diff.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_dump.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_error.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_fetch.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_format.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_gfx.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_graph.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_graph_helper.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_hw.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_info.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_last.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_nan_inf.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_open.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_resize.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_restore.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_rpncalc.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_thread_safe_nt.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_tune.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_update.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="rrd_xport.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/win32/rrdtool.dsp b/win32/rrdtool.dsp
--- /dev/null
+++ b/win32/rrdtool.dsp
@@ -0,0 +1,92 @@
+# Microsoft Developer Studio Project File - Name="rrdtool" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=rrdtool - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "rrdtool.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "rrdtool.mak" CFG="rrdtool - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "rrdtool - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "rrdtool - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "rrdtool - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "rrdtool_"
+# PROP BASE Intermediate_Dir "rrdtool_"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "toolrelease"
+# PROP Intermediate_Dir "toolrelease"
+# 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 "../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 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 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"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "rrdtool0"
+# PROP BASE Intermediate_Dir "rrdtool0"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "tooldebug"
+# PROP Intermediate_Dir "tooldebug"
+# 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 "../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 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 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
+
+# Begin Target
+
+# Name "rrdtool - Win32 Release"
+# Name "rrdtool - Win32 Debug"
+# Begin Source File
+
+SOURCE=..\src\rrd_tool.c
+# End Source File
+# End Target
+# End Project
diff --git a/win32/rrdtool.dsw b/win32/rrdtool.dsw
--- /dev/null
+++ b/win32/rrdtool.dsw
@@ -0,0 +1,44 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "rrdtool"=".\rrdtool.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name rrd
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/win32/rrdtool.plg b/win32/rrdtool.plg
--- /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/win32/rrdtool.vcproj b/win32/rrdtool.vcproj
--- /dev/null
+++ b/win32/rrdtool.vcproj
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="rrdtool"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\toolrelease"
+ IntermediateDirectory=".\toolrelease"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="4"
+ AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
+ PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;_CTYPE_DISABLE_MACROS"
+ RuntimeLibrary="2"
+ PrecompiledHeaderFile=".\toolrelease/rrdtool.pch"
+ AssemblerListingLocation=".\toolrelease/"
+ ObjectFile=".\toolrelease/"
+ ProgramDataBaseFileName=".\toolrelease/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libpng.lib libz.lib libart_lgpl.lib libfreetype.lib"
+ OutputFile=".\toolrelease/rrdtool.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="\Program Files\GnuWin32\lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\toolrelease/rrdtool.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\toolrelease/rrdtool.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="4108"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\tooldebug"
+ IntermediateDirectory=".\tooldebug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
+ PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_CTYPE_DISABLE_MACROS"
+ RuntimeLibrary="2"
+ PrecompiledHeaderFile=".\tooldebug/rrdtool.pch"
+ AssemblerListingLocation=".\tooldebug/"
+ ObjectFile=".\tooldebug/"
+ ProgramDataBaseFileName=".\tooldebug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libpng.lib libz.lib libart_lgpl.lib libfreetype.lib"
+ OutputFile=".\tooldebug/rrdtool.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="\Program Files\GnuWin32\lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\tooldebug/rrdtool.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\tooldebug/rrdtool.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="4108"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="rrd_tool.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>