fixes for compiling rrdtool with win32 mingw and netware -- Guenter Knauf <gk with...

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@674 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/Makefile.am b/program/Makefile.am
index 0e4263a6d598df49d21b7e6f2f572b963035150e..9fbe6d088e55b2ec5920d5c41529d6cc5eb9cafc 100644 (file)
--- a/program/Makefile.am
+++ b/program/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = src bindings doc examples
 
   # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
-            rrdtool.spec
+            rrdtool.spec confignt/config.h
 
 CLEANFILES = config.cache
 

diff --git a/program/src/Makefile.NetWare b/program/src/Makefile.NetWare
new file mode 100644 (file)
index 0000000..17320c0
--- /dev/null
+++ b/program/src/Makefile.NetWare
@@ -0,0 +1,421 @@
+# Gnu Makefile for NetWare target * 20-Aug-2005
+# for use with gcc/nlmconv or Metrowerks CodeWarrior compiler
+# use with: make -f Makefile.NetWare [all|clean|dist]
+
+SOURCE = rrd_tool
+#SOURCE        = rrd_cgi
+TARGET = $(subst _,,$(SOURCE))
+DESCR  = Round Robin Database Tool $(RRD_VERSION_STR)
+COPYR  = Copyright (c) 1997-2005 by Tobias Oetiker
+#WWWURL        = http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/
+WWWURL = http://www.rrdtool.org/
+MTSAFE = YES
+#SCREEN        = $(TARGET)
+STACK  = 49152
+# Comment the line below if you dont want to load protected automatically.
+#LDRING        = 3
+
+# Edit the path below to point to your Novell NDK.
+ifndef NDKBASE
+NDKBASE        = c:/novell
+endif
+# Edit the path below to point to your install destination.
+# INSTDIR = /mnt/sys/mrtg/rrd
+INSTDIR        = s:/mrtg/rrd
+
+# Base for the lib sources
+ifndef LIBBASE
+LIBBASE        = d:/projects/cw
+endif
+# All library code is statically linked to avoid problems with other lib NLMs. 
+# Edit the path below to point to your libgd sources or set environment var.
+ifndef LIBGD
+LIBGD  = $(LIBBASE)/gd-2.0.33
+endif
+# Edit the path below to point to your libpng sources or set environment var.
+ifndef LIBPNG
+LIBPNG = $(LIBBASE)/libpng-1.2.8
+endif
+# Edit the path below to point to your freetype sources or set environment var.
+ifndef LIBFT2
+LIBFT2 = $(LIBBASE)/freetype-2.1.9
+endif
+# Edit the path below to point to your freetype sources or set environment var.
+ifndef LIBART
+LIBART = $(LIBBASE)/libart_lgpl-2.3.3
+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 zlib sources or set environment var.
+ifndef LIBCGI
+#LIBCGI        = $(LIBBASE)/cgilib-0.4
+LIBCGI = d:/rrdtool-1.0.50/cgilib-0.4
+endif
+
+# 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 -fv
+# 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.com/development/prgtools/mkxdc.zip
+MPKXDC = mkxdc
+
+# 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=1
+#CFLAGS        += -DHAVE_LIBPNG
+
+CP     = cp -af
+
+ifeq ($(CC),mwccnlm)
+LD     = mwldnlm
+LDFLAGS        = -nostdlib $(PRELUDE) $(OBJS) $(LIBS) -o $(OBJDIR)/$(TARGET).nlm -commandfile
+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
+CFLAGS += -fno-builtin -fpack-struct -fpcc-struct-return
+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
+ifdef XDCOPT
+       XDCDATA = $(OBJDIR)/$(TARGET).xdc
+endif
+ifndef COPYR
+       COPYR = Copyright (c) 2005 The Open Source Community.
+endif
+ifndef DESCR
+       DESCR = $(TARGET) Command Extension
+endif
+DESCR += ($(LIBARCH)) - $(CC) build
+
+NDK_ROOT = $(NDKBASE)/ndk
+SDK_CLIB = $(NDK_ROOT)/nwsdk
+SDK_LIBC = $(NDK_ROOT)/libc
+
+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
+
+INCLUDES += -I. -I$(LIBGD) -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
+ifeq ($(SOURCE),rrd_cgi)
+INCLUDES += -I$(LIBCGI)
+endif
+
+CFLAGS += $(INCLUDES)
+
+vpath %.c . $(LIBGD) $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) $(LIBCGI)
+
+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 \
+       $(OBJDIR)/strftime.o \
+       $(EOLIST)
+
+GD2LIBOBJS     = \
+       $(OBJDIR)/gd.o \
+       $(OBJDIR)/gd_io.o \
+       $(OBJDIR)/gd_io_dp.o \
+       $(OBJDIR)/gd_io_file.o \
+       $(OBJDIR)/gd_io_ss.o \
+       $(OBJDIR)/gd_png.o \
+       $(OBJDIR)/gd_ss.o \
+       $(OBJDIR)/gdcache.o \
+       $(OBJDIR)/gdfonts.o \
+       $(OBJDIR)/gdhelpers.o \
+       $(OBJDIR)/gdtables.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) $(GD2LIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
+ifeq ($(SOURCE),rrd_cgi)
+OBJS   += $(OBJDIR)/cgi.o
+endif
+OBJS   += $(OBJDIR)/$(SOURCE).o
+
+LIBS   = $(LIBFT2)/builds/netware/libc/libft2.lib
+
+
+all: $(OBJDIR) config.h $(OBJDIR)/$(TARGET).nlm
+
+dist: all
+       -$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
+       -$(RM) $(OBJDIR)/$(TARGET).def $(XDCDATA)
+       -$(RM) config.h
+
+install: all
+       @[ -d $(INSTDIR) ] || mkdir $(INSTDIR)
+       @$(CP) $(TARGET).nlm $(INSTDIR)
+
+clean:
+       -$(RM) -r $(OBJDIR)
+       -$(RM) config.h
+
+$(OBJDIR):
+       @mkdir $(OBJDIR)
+
+$(OBJDIR)/%.o: %.c
+       @echo Compiling $<
+       @$(CC) $(CFLAGS) -c $< -o $@
+
+$(OBJDIR)/version.inc: ../configure $(OBJDIR) get_ver.awk
+       @echo Creating $@
+       @awk -f get_ver.awk $< > $@
+
+$(OBJDIR)/$(TARGET).nlm: $(OBJDIR) $(OBJS) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).def $(XDCDATA)
+       @echo Linking $@
+       @-$(RM) $@
+       @$(LD) $(LDFLAGS) $(OBJDIR)/$(TARGET).def
+
+$(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 "$(TARGET)"$(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 XDCDATA
+       @echo $(DL)xdcdata $(XDCDATA)$(DL) >> $@
+endif
+ifeq ($(LD),nlmconv)
+       @echo $(DL)input $(OBJS) $(LIBS)$(DL) >> $@
+       @echo $(DL)input $(PRELUDE)$(DL) >> $@
+       @echo $(DL)output $(TARGET).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_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 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) >> $@
+       @echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
+       @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE 90.0$(DL) >> $@
+
+

diff --git a/program/src/Makefile.Win32 b/program/src/Makefile.Win32
new file mode 100644 (file)
index 0000000..eccfee0
--- /dev/null
+++ b/program/src/Makefile.Win32
@@ -0,0 +1,350 @@
+# Gnu Makefile for Win32 target * 20-Aug-2005\r
+# for use with MingW32 gcc or Metrowerks CodeWarrior compiler\r
+# use with: make -f Makefile.Win32 [all|clean|dist]\r
+\r
+SOURCE = rrd_tool\r
+#SOURCE        = rrd_cgi\r
+TARGET = $(subst _,,$(SOURCE))\r
+#DESCR = Round Robin Database Tool $(RRD_VERSION_STR)\r
+DESCR  = Round Robin Database Tool\r
+COPYR  = Copyright (c) 1997-2005 by Tobias Oetiker\r
+#WWWURL        = http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/\r
+WWWURL = http://www.rrdtool.org/\r
+\r
+# Edit the path below to point to your install destination.\r
+# INSTDIR = /mnt/sys/mrtg/rrd\r
+INSTDIR        = c:/mrtg/rrd\r
+\r
+# Base for the lib sources\r
+ifndef LIBBASE\r
+LIBBASE        = d:/projects/cw\r
+endif\r
+# All library code is statically linked to avoid problems with other lib NLMs. \r
+# Edit the path below to point to your libgd sources or set environment var.\r
+ifndef LIBGD\r
+LIBGD  = $(LIBBASE)/gd-2.0.15\r
+endif\r
+# Edit the path below to point to your libpng sources or set environment var.\r
+ifndef LIBPNG\r
+LIBPNG = $(LIBBASE)/libpng-1.2.8\r
+endif\r
+# Edit the path below to point to your freetype sources or set environment var.\r
+ifndef LIBFT2\r
+#LIBFT2        = $(LIBBASE)/freetype-2.1.9\r
+LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.1.9\r
+endif\r
+# Edit the path below to point to your freetype sources or set environment var.\r
+ifndef LIBART\r
+LIBART = $(LIBBASE)/libart_lgpl-2.3.3\r
+endif\r
+# Edit the path below to point to your zlib sources or set environment var.\r
+ifndef ZLIBSDK\r
+ZLIBSDK        = $(LIBBASE)/zlib-1.2.3\r
+endif\r
+# Edit the path below to point to your zlib sources or set environment var.\r
+ifndef LIBCGI\r
+#LIBCGI        = $(LIBBASE)/cgilib-0.4\r
+LIBCGI = d:/rrdtool-1.0.50/cgilib-0.4\r
+endif\r
+\r
+# The following line defines your compiler.\r
+ifdef METROWERKS\r
+       CC = mwcc\r
+else\r
+       CC = gcc\r
+endif\r
+# RM   = rm -f\r
+CP     = cp -fv\r
+\r
+# must be equal to DEBUG or NDEBUG\r
+DB     = NDEBUG\r
+# DB   = DEBUG\r
+# Optimization: -O<n> or debugging: -g\r
+ifeq ($(DB),NDEBUG)\r
+       OPT     = -O2\r
+       OBJDIR  = release\r
+else\r
+       OPT     = -g\r
+       OBJDIR  = debug\r
+endif\r
+\r
+# Include the version info retrieved from source.\r
+-include $(OBJDIR)/version.inc\r
+\r
+# Global flags for all compilers\r
+CFLAGS = $(OPT) -D$(DB) -DHAVE_CONFIG_H\r
+\r
+ifeq ($(CC),mwcc)\r
+LD     = mwld\r
+CFLAGS += -gccinc -msgstyle gcc -inline off -opt nointrinsics -inst mmx -proc 586\r
+#CFLAGS        += -w on,nounused,nounusedexpr\r
+#CFLAGS        += -ansi strict\r
+CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"\r
+LD     = mwld\r
+RC     = mwwinrc\r
+LDFLAGS        = -nostdlib\r
+LIBPATH        += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"\r
+LDLIBS += -lkernel32.lib -luser32.lib\r
+LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib\r
+LIBEXT = lib\r
+RCFLAGS        =\r
+else\r
+LD     = gcc\r
+RC     = windres\r
+LDFLAGS        = -s\r
+LIBEXT = a\r
+RCFLAGS        = -I rc -O coff -i\r
+CFLAGS += -Wall -Wno-format -Wno-unused # -pedantic\r
+endif\r
+\r
+ifndef COPYR\r
+       COPYR = Copyright (c) 2005 The Open Source Community.\r
+endif\r
+ifndef DESCR\r
+       DESCR = $(TARGET) Command Extension\r
+endif\r
+DESCR += - $(CC) build\r
+\r
+INCLUDES += -I. -I$(LIBGD) -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)\r
+ifeq ($(SOURCE),rrd_cgi)\r
+INCLUDES += -I$(LIBCGI)\r
+endif\r
+\r
+CFLAGS += $(INCLUDES)\r
+\r
+vpath %.c . $(LIBGD) $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) $(LIBCGI)\r
+\r
+RRDLIBOBJS     = \\r
+       $(OBJDIR)/rrd_afm.o \\r
+       $(OBJDIR)/rrd_afm_data.o \\r
+       $(OBJDIR)/rrd_create.o \\r
+       $(OBJDIR)/rrd_diff.o \\r
+       $(OBJDIR)/rrd_dump.o \\r
+       $(OBJDIR)/rrd_error.o \\r
+       $(OBJDIR)/rrd_fetch.o \\r
+       $(OBJDIR)/rrd_first.o \\r
+       $(OBJDIR)/rrd_format.o \\r
+       $(OBJDIR)/rrd_gfx.o \\r
+       $(OBJDIR)/rrd_graph.o \\r
+       $(OBJDIR)/rrd_graph_helper.o \\r
+       $(OBJDIR)/rrd_hw.o \\r
+       $(OBJDIR)/rrd_info.o \\r
+       $(OBJDIR)/rrd_last.o \\r
+       $(OBJDIR)/rrd_nan_inf.o \\r
+       $(OBJDIR)/rrd_open.o \\r
+       $(OBJDIR)/rrd_resize.o \\r
+       $(OBJDIR)/rrd_restore.o \\r
+       $(OBJDIR)/rrd_rpncalc.o \\r
+       $(OBJDIR)/rrd_tune.o \\r
+       $(OBJDIR)/rrd_update.o \\r
+       $(OBJDIR)/rrd_version.o \\r
+       $(OBJDIR)/rrd_xport.o \\r
+       $(OBJDIR)/rrd_not_thread_safe.o \\r
+       $(EOLIST)\r
+\r
+XLIBOBJS       = \\r
+       $(OBJDIR)/art_rgba_svp.o \\r
+       $(OBJDIR)/getopt.o \\r
+       $(OBJDIR)/getopt1.o \\r
+       $(OBJDIR)/hash_32.o \\r
+       $(OBJDIR)/parsetime.o \\r
+       $(OBJDIR)/pngsize.o \\r
+       $(OBJDIR)/strftime.o \\r
+       $(EOLIST)\r
+\r
+GD2LIBOBJS     = \\r
+       $(OBJDIR)/gd.o \\r
+       $(OBJDIR)/gd_io.o \\r
+       $(OBJDIR)/gd_io_dp.o \\r
+       $(OBJDIR)/gd_io_file.o \\r
+       $(OBJDIR)/gd_io_ss.o \\r
+       $(OBJDIR)/gd_png.o \\r
+       $(OBJDIR)/gd_ss.o \\r
+       $(OBJDIR)/gdcache.o \\r
+       $(OBJDIR)/gdfonts.o \\r
+       $(OBJDIR)/gdhelpers.o \\r
+       $(OBJDIR)/gdtables.o \\r
+       $(EOLIST)\r
+\r
+PNGLIBOBJS     = \\r
+       $(OBJDIR)/png.o \\r
+       $(OBJDIR)/pngerror.o \\r
+       $(OBJDIR)/pngget.o \\r
+       $(OBJDIR)/pngmem.o \\r
+       $(OBJDIR)/pngpread.o \\r
+       $(OBJDIR)/pngread.o \\r
+       $(OBJDIR)/pngrio.o \\r
+       $(OBJDIR)/pngrtran.o \\r
+       $(OBJDIR)/pngrutil.o \\r
+       $(OBJDIR)/pngset.o \\r
+       $(OBJDIR)/pngtrans.o \\r
+       $(OBJDIR)/pngwio.o \\r
+       $(OBJDIR)/pngwrite.o \\r
+       $(OBJDIR)/pngwtran.o \\r
+       $(OBJDIR)/pngwutil.o \\r
+       $(EOLIST)\r
+ifeq "$(wildcard $(LIBPNG)/pnggccrd.c)" "$(LIBPNG)/pnggccrd.c"\r
+PNGLIBOBJS     += \\r
+       $(OBJDIR)/pnggccrd.o \\r
+       $(OBJDIR)/pngvcrd.o \\r
+       $(EOLIST)\r
+endif\r
+\r
+ZLIBOBJS       = \\r
+       $(OBJDIR)/adler32.o \\r
+       $(OBJDIR)/compress.o \\r
+       $(OBJDIR)/crc32.o \\r
+       $(OBJDIR)/deflate.o \\r
+       $(OBJDIR)/inflate.o \\r
+       $(OBJDIR)/inffast.o \\r
+       $(OBJDIR)/inftrees.o \\r
+       $(OBJDIR)/trees.o \\r
+       $(OBJDIR)/zutil.o \\r
+       $(EOLIST)\r
+ifeq "$(wildcard $(ZLIBSDK)/infblock.c)" "$(ZLIBSDK)/infblock.c"\r
+ZLIBOBJS       += \\r
+       $(OBJDIR)/infblock.o \\r
+       $(OBJDIR)/infcodes.o \\r
+       $(OBJDIR)/infutil.o \\r
+       $(EOLIST)\r
+endif\r
+\r
+ARTLIBOBJS     = \\r
+       $(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))\r
+\r
+OBJS   = $(RRDLIBOBJS) $(XLIBOBJS) $(GD2LIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)\r
+ifeq ($(SOURCE),rrd_cgi)\r
+OBJS   += $(OBJDIR)/cgi.o\r
+endif\r
+OBJS   += $(OBJDIR)/$(SOURCE).o\r
+\r
+LDLIBS = $(LIBFT2)/objs/freetype.$(LIBEXT)\r
+\r
+\r
+all: $(OBJDIR) config.h $(OBJDIR)/$(TARGET).exe\r
+\r
+dist: all\r
+       -$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv\r
+       -$(RM) $(OBJDIR)/$(TARGET).def $(OBJDIR)/$(TARGET).res\r
+\r
+install: all\r
+       @[ -d $(INSTDIR) ] || mkdir $(INSTDIR)\r
+       @$(CP) $(TARGET).exe $(INSTDIR)\r
+\r
+clean:\r
+       -$(RM) -r $(OBJDIR)\r
+       -$(RM) config.h\r
+\r
+$(OBJDIR):\r
+       @mkdir $(OBJDIR)\r
+\r
+$(OBJDIR)/version.inc: ../configure $(OBJDIR) get_ver.awk\r
+       @echo Creating $@\r
+       @awk -f get_ver.awk $< > $@\r
+\r
+$(OBJDIR)/%.o: %.c\r
+       @echo Compiling $<\r
+       @$(CC) $(CFLAGS) -c $< -o $@\r
+\r
+$(OBJDIR)/$(TARGET).exe: $(OBJS) $(OBJDIR)/$(TARGET).res\r
+       @echo Linking $@\r
+       @-$(RM) $@\r
+       @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)\r
+\r
+$(OBJDIR)/%.res: $(OBJDIR)/%.rc\r
+       @echo Creating $@\r
+       @$(RC) $(RCFLAGS) $< -o $@\r
+\r
+$(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc \r
+       @echo 1 VERSIONINFO > $@\r
+       @echo  FILEVERSION $(RRD_VERSION),0 >> $@\r
+       @echo  PRODUCTVERSION $(RRD_VERSION),0 >> $@\r
+       @echo  FILEFLAGSMASK 0x3fL >> $@\r
+       @echo  FILEOS 0x40004L >> $@\r
+       @echo  FILEFLAGS 0x0L >> $@\r
+       @echo  FILETYPE 0x1L >> $@\r
+       @echo  FILESUBTYPE 0x0L >> $@\r
+       @echo BEGIN >> $@\r
+       @echo   BLOCK "StringFileInfo" >> $@\r
+       @echo   BEGIN >> $@\r
+       @echo     BLOCK "040904E4" >> $@\r
+       @echo     BEGIN >> $@\r
+       @echo       VALUE "LegalCopyright","$(COPYR)\0" >> $@\r
+#      @echo       VALUE "CompanyName","$(COMPANY)\0" >> $@\r
+       @echo       VALUE "ProductName","$(TARGET).exe\0" >> $@\r
+       @echo       VALUE "ProductVersion","$(RRD_VERSION_STR)\0" >> $@\r
+       @echo       VALUE "License","Released under GPL.\0" >> $@\r
+       @echo       VALUE "FileDescription","$(DESCR)\0" >> $@\r
+       @echo       VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@\r
+       @echo       VALUE "InternalName","$(TARGET)\0" >> $@\r
+       @echo       VALUE "OriginalFilename","$(TARGET).exe\0" >> $@\r
+ifdef WWWURL\r
+       @echo       VALUE "WWW","$(WWWURL)\0" >> $@\r
+endif\r
+       @echo     END >> $@\r
+       @echo   END >> $@\r
+       @echo   BLOCK "VarFileInfo" >> $@\r
+       @echo   BEGIN >> $@\r
+       @echo     VALUE "Translation", 0x409, 1252 >> $@\r
+       @echo   END >> $@\r
+       @echo END >> $@\r
+ifdef ICON\r
+       @echo 1 ICON DISCARDABLE "$(ICON)" >> $@\r
+endif\r
+\r
+config.h: Makefile.Win32 $(OBJDIR)/version.inc\r
+       @echo Creating $@\r
+       @echo $(DL)/* $@ for NetWare target.$(DL) > $@\r
+       @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@\r
+       @echo $(DL)** All your changes will be lost!!$(DL) >> $@\r
+       @echo $(DL)*/$(DL) >> $@\r
+       @echo $(DL)#define OS "i586-pc-Win32"$(DL) >> $@\r
+       @echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@\r
+       @echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@\r
+       @echo $(DL)#define NUMVERS $(RRD_NUMVERS)$(DL) >> $@\r
+       @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@\r
+#      @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_LOCALE_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_MATH_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_MBSTOWCS 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_SELECT 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@\r
+#      @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_SNPRINTF 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STDARG_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STDDEF_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STDINT_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STDLIB_H 1$(DL) >> $@\r
+#      @echo $(DL)#define HAVE_STRCASECMP 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STRDUP 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STRFTIME 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STRING_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_UNAME 1$(DL) >> $@\r
+#      @echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@\r
+       @echo $(DL)#define STDC_HEADERS 1$(DL) >> $@\r
+       @echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@\r
+       @echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@\r
+       @echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@\r
+       @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE 90.0$(DL) >> $@\r
+\r
+\r

diff --git a/program/src/Makefile.am b/program/src/Makefile.am
index 5d2e8098242877c5745b3ccd2175346b12b7bc89..6bee6b71b0109a24128c4e1a60e83a814d6ac075 100644 (file)
--- a/program/src/Makefile.am
+++ b/program/src/Makefile.am
@@ -4,7 +4,6 @@
 #
 #ACLOCAL_M4       = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
-DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
 fontsdir =  $(datadir)/rrdtool/fonts
 fonts_DATA = DejaVuSansMono-Roman.ttf
 
@@ -133,4 +132,5 @@ rrdtool_LDADD       = librrd.la
 
 # strftime is here because we do not usually need it. unices have propper
 # iso date support
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw strftime.c strftime.h $(fonts_DATA)
+EXTRA_DIST= rrdtool.dsp rrdtool.dsw strftime.c strftime.h rrd.dsp $(fonts_DATA) \
+       Makefile.Win32 Makefile.NetWare get_ver.awk win32comp.c

diff --git a/program/src/get_ver.awk b/program/src/get_ver.awk
new file mode 100644 (file)
index 0000000..09d4e40
--- /dev/null
+++ b/program/src/get_ver.awk
@@ -0,0 +1,18 @@
+# fetch rrdtool version number from input file and write them to STDOUT\r
+BEGIN {\r
+  while ((getline < ARGV[1]) > 0) {\r
+    if (match ($0, /^PACKAGE_VERSION=/)) {\r
+      split($1, t, "=");\r
+      my_ver_str = substr(t[2],2,length(t[2])-2);\r
+      split(my_ver_str, v, ".");\r
+      my_ver = v[1] "," v[2] "," v[3];\r
+    }\r
+    if (match ($0, /^NUMVERS=/)) {\r
+      split($1, t, "=");\r
+      my_num_ver = t[2];\r
+    }\r
+  }\r
+  print "RRD_VERSION = " my_ver "";\r
+  print "RRD_VERSION_STR = " my_ver_str "";\r
+  print "RRD_NUMVERS = " my_num_ver "";\r
+}\r

diff --git a/program/src/rrd_afm.c b/program/src/rrd_afm.c
index 8befa2998e500b3fc4eed8ff3feabe0850b3c798..e9a7860caca9e256458cecd26e125c37a5024d0a 100644 (file)
--- a/program/src/rrd_afm.c
+++ b/program/src/rrd_afm.c
@@ -4,11 +4,13 @@
  * rrd_afm.h  Parsing afm tables to find width of strings.
  ****************************************************************************/
 
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
 #include "../confignt/config.h"
 #else
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#endif
 
 #include "rrd_afm.h"
 #include "rrd_afm_data.h"

diff --git a/program/src/rrd_dump.c b/program/src/rrd_dump.c
index 348a3cd4d4915e0c2d020d7f6526d1ba160fd4e4..d3a02f589445ee64f20c5bd0935c2309d6427fcc 100644 (file)
--- a/program/src/rrd_dump.c
+++ b/program/src/rrd_dump.c
@@ -45,7 +45,9 @@
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
 
+#ifndef NETWARE
 extern char *tzname[2];
+#endif
 
 int
 rrd_dump(int argc, char **argv) 

diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c
index fba0fa04ff551fe76a57351f0d5e53993d2be871..1994bb91e0296455f3df6c453ce6cfd90311732b 100644 (file)
--- a/program/src/rrd_tool.c
+++ b/program/src/rrd_tool.c
@@ -23,11 +23,7 @@ void PrintUsage(char *cmd)
 
     char help_main[] =
           "RRDtool " PACKAGE_VERSION "  Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
            "               Compiled " __DATE__ " " __TIME__ "\n\n"
-#else
-           "               Compiled " MAKE_TIMESTAMP "\n\n"
-#endif          
           "Usage: rrdtool [options] command command_options\n\n";
 
     char help_list[] =

diff --git a/program/src/rrd_tool.h b/program/src/rrd_tool.h
index de67b64210db8212e0cdfba00df557b81cf1f6d8..e1a79615fc2676aa5c8eb76c094e77a0a0ca7002 100644 (file)
--- a/program/src/rrd_tool.h
+++ b/program/src/rrd_tool.h
@@ -11,7 +11,7 @@ extern "C" {
 #ifndef _RRD_TOOL_H
 #define _RRD_TOOL_H
 
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
 #include "../confignt/config.h"
 #else
 #ifdef HAVE_CONFIG_H
@@ -100,6 +100,12 @@ extern int getrusage(int, struct rusage *);
 /* Win32 only includes */
 
 #include <float.h>        /* for _isnan  */
+#ifdef __MINGW32__
+#define localtime_r(a,b) localtime(a)
+#define ctime_r(a,b) ctime(a)
+#define gmtime_r(a,b) gmtime(a)
+#define strtok_r(a,b,c) strtok(a,b)
+#else
 #define isnan _isnan
 #define finite _finite
 #define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
@@ -107,6 +113,7 @@ struct tm* localtime_r(const time_t *timep, struct tm* result);
 char* ctime_r(const time_t *timep, char* result);
 struct tm* gmtime_r(const time_t *timep, struct tm* result);
 char *strtok_r(char *str, const char *sep, char **last);
+#endif
 
 #else
 

diff --git a/program/src/rrd_update.c b/program/src/rrd_update.c
index 1b0cd9aa32d4fc8880873536df503f8b19bdf238..e8d629ea22568b972f71cb858cb06838b8d5ea14 100644 (file)
--- a/program/src/rrd_update.c
+++ b/program/src/rrd_update.c
@@ -32,24 +32,28 @@
  */
 #include <sys/timeb.h>
 
+#ifndef __MINGW32__
 struct timeval {
        time_t tv_sec; /* seconds */
        long tv_usec;  /* microseconds */
 };
+#endif
 
 struct __timezone {
        int  tz_minuteswest; /* minutes W of Greenwich */
        int  tz_dsttime;     /* type of dst correction */
 };
 
-static gettimeofday(struct timeval *t, struct __timezone *tz) {
-       
-       struct timeb current_time;
+static int gettimeofday(struct timeval *t, struct __timezone *tz) {
+
+       struct _timeb current_time;
 
        _ftime(&current_time);
-       
+
        t->tv_sec  = current_time.time;
        t->tv_usec = current_time.millitm * 1000;
+
+       return 0;
 }
 
 #endif

diff --git a/program/src/rrdtool.dsp b/program/src/rrdtool.dsp
index 215ac7d85a2739fa84330bd0070884362a28f4c2..8a381761428a8f27fb28509af2dff1f679325de1 100644 (file)
--- a/program/src/rrdtool.dsp
+++ b/program/src/rrdtool.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /I "\Program Files\GnuWin32\include" /I "\Program Files\GnuWin32\include\freetype2" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /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"
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "\Program Files\GnuWin32\include\freetype2" /I "\Program Files\GnuWin32\include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /D MAKE_TIMESTAMP=\"WIN32\" /FR /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"

diff --git a/program/src/rrdtool.vcproj b/program/src/rrdtool.vcproj
index dad37e724c96db6ff9dc1810a5f0410a33752579..7ba111aee7be32471530f6bbb1d90c2e314b17ae 100644 (file)
--- a/program/src/rrdtool.vcproj
+++ b/program/src/rrdtool.vcproj
@@ -22,7 +22,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="4"
                                AdditionalIncludeDirectories="\Program Files\GnuWin32\include,\Program Files\GnuWin32\include\freetype2"
-                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;_CTYPE_DISABLE_MACROS;MAKE_TIMESTAMP=\"WIN32\""
+                               PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;_CTYPE_DISABLE_MACROS"
                                RuntimeLibrary="2"
                                PrecompiledHeaderFile=".\toolrelease/rrdtool.pch"
                                AssemblerListingLocation=".\toolrelease/"
@@ -81,7 +81,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="\Program Files\GnuWin32\include\freetype2,\Program Files\GnuWin32\include"
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_CTYPE_DISABLE_MACROS;MAKE_TIMESTAMP=\"WIN32\""
+                               PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;_CTYPE_DISABLE_MACROS"
                                RuntimeLibrary="2"
                                PrecompiledHeaderFile=".\tooldebug/rrdtool.pch"
                                AssemblerListingLocation=".\tooldebug/"