[Linux-ha-dev] Re: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from

[Guochun Shi]

This patch breaks the stable branch:

gmake[2]: Entering directory `/home/gshi/linux-ha-stable/lib/pils'
if /bin/sh ../../libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I../../linux-ha -I../../in
clude -I../../include -I../../include -I../../linux-ha -I../../linux-ha -I../../libltdl -I../..
/libltdl  -I/usr/include/glib-1.2 -I/usr/lib/glib/include   -I/usr/include/libxml2 -g -O2 -fno-
strict-aliasing  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wpointe
r-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-format-
attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Werror  -ggdb3 -g -O
2 -fno-strict-aliasing  -Wall -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -
Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-align -Wbad-function-cast -Winline -Wmissing-
format-attribute -Wformat=2 -Wformat-security -Wformat-nonliteral -Wno-long-long -Werror  -ggdb
3 -MT pils.lo -MD -MP -MF ".deps/pils.Tpo" \
  -c -o pils.lo `test -f 'pils.c' || echo './'`pils.c; \
then mv -f ".deps/pils.Tpo" ".deps/pils.Plo"; \
else rm -f ".deps/pils.Tpo"; exit 1; \
fi
rm -f .libs/pils.lo
gcc -DHAVE_CONFIG_H -I. -I. -I../../linux-ha -I../../include -I../../include -I../../include -I
../../linux-ha -I../../linux-ha -I../../libltdl -I../../libltdl -I/usr/include/glib-1.2 -I/usr/
lib/glib/include -I/usr/include/libxml2 -g -O2 -fno-strict-aliasing -Wall -Wmissing-prototypes 
-Wmissing-declarations -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wcast-qual -Wcast-a
lign -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security -Wfor
mat-nonliteral -Wno-long-long -Werror -ggdb3 -g -O2 -fno-strict-aliasing -Wall -Wmissing-protot
ypes -Wmissing-declarations -Wstrict-prototypes -Wpointer-arith -Wwrite-strings -Wcast-qual -Wc
ast-align -Wbad-function-cast -Winline -Wmissing-format-attribute -Wformat=2 -Wformat-security 
-Wformat-nonliteral -Wno-long-long -Werror -ggdb3 -MT pils.lo -MD -MP -MF .deps/pils.Tpo -c pil
s.c  -fPIC -DPIC -o .libs/pils.lo
In file included from pils.c:22:
../../linux-ha/portability.h:57:24: missing binary operator
gmake[2]: *** [pils.lo] Error 1
gmake[2]: Leaving directory `/home/gshi/linux-ha-stable/lib/pils'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/home/gshi/linux-ha-stable/lib'
make: *** [all-recursive] Error 1


-Guochun



At 09:43 AM 12/15/2004 -0700, you wrote:
>linux-ha CVS committal
>
>Author  : alan
>Host    : 
>Module  : linux-ha
>
>Dir     : linux-ha/linux-ha
>
>
>Modified Files:
>      Tag: STABLE_1_2
>        portability.h 
>
>
>Log Message:
>Put in a number of portability fixes - most by Roberto Nibali (ratz).
>
>===================================================================
>RCS file: /home/cvs/linux-ha/linux-ha/linux-ha/portability.h,v
>retrieving revision 1.31.2.2
>retrieving revision 1.31.2.3
>diff -u -3 -r1.31.2.2 -r1.31.2.3
>--- portability.h       29 Apr 2004 03:12:24 -0000      1.31.2.2
>+++ portability.h       15 Dec 2004 16:43:50 -0000      1.31.2.3
>@@ -1,4 +1,4 @@
>-/* $Id: portability.h,v 1.31.2.2 2004/04/29 03:12:24 alan Exp $ */
>+/* $Id: portability.h,v 1.31.2.3 2004/12/15 16:43:50 alan Exp $ */
> #ifndef PORTABILITY_H
> #  define PORTABILITY_H
> 
>@@ -24,10 +24,13 @@
> 
> #define        EOS                     '\0'
> #define        DIMOF(a)                ((int) (sizeof(a)/sizeof(a[0])) )
>-#define        STRLEN(conststr)        ((int)(sizeof(conststr)/sizeof(char))-1)
>+#define        STRLEN_CONST(conststr)  ((size_t)((sizeof(conststr)/sizeof(char))-1))
>+#define        STRNCMP_CONST(varstr, conststr) strncmp((varstr), conststr, STRLEN_CONST(conststr)+1)
>+#define        STRLEN(c)               STRLEN_CONST(c)
> 
> /* Needs to be defined before any other includes, otherwise some system
>  * headers do not behave as expected! Major black magic... */
>+#undef _GNU_SOURCE  /* in case it was defined on the command line */
> #define _GNU_SOURCE
> 
> #ifdef __STDC__
>@@ -47,14 +50,24 @@
> #if    __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
> #define G_GNUC_PRINTF( format_idx, arg_idx )   \
>   __attribute__((format (printf, format_idx, arg_idx)))
>-#else  /* !__GNUC__ */
>+#else  
> #define G_GNUC_PRINTF( format_idx, arg_idx )
>-#endif /* !__GNUC__ */
>+#endif
>+
>+#if defined(__GLIBC__) __GLIBC__ >= 2 && __GLIBC_MINOR__ < 2
>+       typedef uint32_t in_addr_t;
>+#endif 
> 
> #ifdef HAVE_CONFIG_H
> #include <config.h>
> #endif
> 
>+#if defined(ANSI_ONLY) && !defined(inline)
>+#      define inline   /* nothing */
>+#      undef   NETSNMP_ENABLE_INLINE
>+#      define  NETSNMP_NO_INLINE 1
>+#endif
>+
> #ifndef HA_HAVE_SETENV
>   /* We supply a replacement function, but need a prototype */
> 
>@@ -66,8 +79,6 @@
>   /* We supply a replacement function, but need a prototype */
> char * strerror(int errnum);
> #endif /* HA_HAVE_STRERROR */
>-
>-int setenv(const char *name, const char * value, int why);
> 
> 
> #ifndef HA_HAVE_SCANDIR
>
>
>_______________________________________________
>Linux-ha-cvs mailing list
>Linux-ha-cvs at lists.linux-ha.org
>http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs