Jan Wieck wrote:
On 5/1/2010 5:26 PM, Steve Singer wrote:
David Fetter wrote:
Folks,
I think the intention of the patch is to look for a suitable size_t and
fallback to int if none was found.
The patch seemed to address 1 things
1) Support for newer autoconfs, which seems to not break the older 2.59.
I am happy committing that portion of the patch (attached here, also
available as commit b77b608d63cab2a4519f66f7436a29cc808b502a on the
REL2_0_PROPOSED_ssinger branch at my git mirror
(git://github.com/ssinger/slony.git) of the code.
2) The issue with the datatype to use for yyleng. I would like to know
the actual error your getting on osx and what version of flex it is
using. If it really should be size_t then this patch isn't sufficient
(we need to change all imports of yyleng) but as Jan points out that
doesn't seem right on some platforms.
Can someone with easy access to an osx machine try building slony with
the above autoconf patch applied and report on what is happening?
Thanks
However, in my flex skeleton file (flex 2.5.35 FreeBSD) it is defined as
extern int. That is why scan.c has it as int, because the extern
declaration in there is coming from the skeleton, not the scan.l file.
Jan
--
Steve Singer
Afilias Canada
Data Services Developer
416-673-1142
diff --git a/config/acx_libpq.m4 b/config/acx_libpq.m4
index 6047544..cf1412d 100644
--- a/config/acx_libpq.m4
+++ b/config/acx_libpq.m4
@@ -397,11 +397,11 @@ if test -z "$ac_cv_typenameTypeId_args"; then
AC_MSG_RESULT(no)
else
if test "$ac_cv_typenameTypeId_args" = 3; then
- AC_DEFINE(HAVE_TYPENAMETYPEID_3)
+ AC_DEFINE(HAVE_TYPENAMETYPEID_3,1,[typenameTypeId has 3 arguments])
elif test "$ac_cv_typenameTypeId_args" = 2; then
- AC_DEFINE(HAVE_TYPENAMETYPEID_2)
+ AC_DEFINE(HAVE_TYPENAMETYPEID_2,1,[typenameTypeId has 2 arguments])
elif test "$ac_cv_typenameTypeId_args" = 1; then
- AC_DEFINE(HAVE_TYPENAMETYPEID_1)
+ AC_DEFINE(HAVE_TYPENAMETYPEID_1,1,[typenameTypeId has 1 argument])
fi
AC_MSG_RESULT([yes, and it takes $ac_cv_typenameTypeId_args arguments])
fi
@@ -410,7 +410,7 @@ AC_MSG_CHECKING(for GetActiveSnapshot)
AC_EGREP_HEADER(GetActiveSnapshot,
utils/snapmgr.h,
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_GETACTIVESNAPSHOT)],
+ AC_DEFINE(HAVE_GETACTIVESNAPSHOT,1,[GetActiveSnapshot in utils/snapmgr.h])],
AC_MSG_RESULT(no)
)
@@ -419,9 +419,9 @@ if test -z "$ac_cv_ScanKeywordLookup_args"; then
AC_MSG_RESULT(no)
else
if test "$ac_cv_ScanKeywordLookup_args" = 1; then
- AC_DEFINE(SCANKEYWORDLOOKUP_1)
+ AC_DEFINE(SCANKEYWORDLOOKUP_1,1,[ScanKeyWordLookup has 1 argument])
elif test "$ac_cv_ScanKeywordLookup_args" = 3; then
- AC_DEFINE(SCANKEYWORDLOOKUP_3)
+ AC_DEFINE(SCANKEYWORDLOOKUP_3,1,[ScanKeyWordLookup has 3 arguments])
fi
AC_MSG_RESULT([yes, and it takes $ac_cv_ScanKeywordLookup_args arguments])
fi
@@ -431,7 +431,7 @@ if test -z "$ac_cv_standard_conforming_strings"; then
AC_EGREP_HEADER(standard_conforming_strings,
parser/gramparse.h,
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STANDARDCONFORMINGSTRINGS)],
+ AC_DEFINE(HAVE_STANDARDCONFORMINGSTRINGS,1,[standard_conforming_strings in parser/gramparse.h])],
AC_MSG_RESULT(no)
)
fi
diff --git a/configure.ac b/configure.ac
index 9aaf910..afe2176 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ m4_define([SLONREL_VERSION], esyscmd([echo "$Name: $" | \
sed -e 's/\:\ REL_//' -e 's/\$//g' -e 's/_/./g' -e 's/\./\_/3' \
-e 's/\ //g' -e s/\:/`date +HEAD_%Y%m%d`/ | tr -d '\n']))
+m4_pattern_allow([^SLON_AC_])
+
AC_INIT(slony1,[SLONREL_VERSION])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_AUX_DIR(config)
@@ -119,9 +121,10 @@ AC_CHECK_FUNCS([strtoul])
AC_CHECK_TYPES([int32_t, uint32_t, u_int32_t])
AC_CHECK_TYPES([int64_t, uint64_t, u_int64_t])
-AC_CHECK_TYPES([ssize_t])
+AC_CHECK_TYPES([size_t, ssize_t])
SLON_AC_FUNC_POSIX_SIGNALS()
+
# ----
# Locate PostgreSQL paths
# ----
diff --git a/src/slony_logshipper/parser.y b/src/slony_logshipper/parser.y
index a3898bf..539e0ef 100755
--- a/src/slony_logshipper/parser.y
+++ b/src/slony_logshipper/parser.y
@@ -11,6 +11,7 @@
*-------------------------------------------------------------------------
*/
+#include "config.h"
#include "postgres.h"
#include "libpq-fe.h"
#include "slony_logshipper.h"
_______________________________________________
Slony1-general mailing list
[email protected]
http://lists.slony.info/mailman/listinfo/slony1-general
