From 43694272486c5dcc66725eaeea445d3dc5b5f7a6 Mon Sep 17 00:00:00 2001 From: Andrew McNab Date: Tue, 18 Mar 2008 13:47:15 +0000 Subject: [PATCH] Sync --- org.gridsite.core/CHANGES | 5 +++++ org.gridsite.core/VERSION | 4 ++-- org.gridsite.core/interface/gridsite.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES index 4234759..2491c7a 100644 --- a/org.gridsite.core/CHANGES +++ b/org.gridsite.core/CHANGES @@ -1,3 +1,8 @@ +* Tue Mar 18 2008 Andrew McNab +- Add extern to declaration of GRSTerrorLogFunc in + gridsite.h (bug #34658 from Luca Petronzio) +* Tue Mar 18 2008 Andrew McNab +- ==== GridSite version 1.5.8 ==== * Fri Nov 9 2007 Andrew McNab - Many changes, including switch to AURI internal format for credentials diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION index 776df0e..51fdc55 100644 --- a/org.gridsite.core/VERSION +++ b/org.gridsite.core/VERSION @@ -1,5 +1,5 @@ MAJOR_VERSION=1 MINOR_VERSION=1.5 -PATCH_VERSION=1.5.6 -DEFVERSION=010506 +PATCH_VERSION=1.5.8 +DEFVERSION=010508 VERSION=$(PATCH_VERSION) diff --git a/org.gridsite.core/interface/gridsite.h b/org.gridsite.core/interface/gridsite.h index 0581ef8..bdd0ddc 100644 --- a/org.gridsite.core/interface/gridsite.h +++ b/org.gridsite.core/interface/gridsite.h @@ -72,7 +72,7 @@ #define GRSTerrorLog(GRSTerrorLevel, ...) if (GRSTerrorLogFunc != NULL) (GRSTerrorLogFunc)(__FILE__, __LINE__, GRSTerrorLevel, __VA_ARGS__) -void (*GRSTerrorLogFunc)(char *, int, int, char *, ...); +extern void (*GRSTerrorLogFunc)(char *, int, int, char *, ...); /* these levels are the same as Unix syslog() and Apache ap_log_error() */ -- 1.8.2.3