[naviserver-devel] Re: [naviserver-commits] naviserver/include nscheck.h,1.2,1.3

[Stephen D. <sd...@gm...>]

On 6/24/05, abe-t <it...@us...> wrote:
> Update of /cvsroot/naviserver/naviserver/include
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14150/include
>=20
> Modified Files:
>         nscheck.h
> Log Message:
>   VC for Windows cannot handle GNU preprocessor
>     directives and macros (fixed).
>=20
>=20
> Index: nscheck.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/naviserver/naviserver/include/nscheck.h,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -C2 -d -r1.2 -r1.3
> *** nscheck.h   11 Jun 2005 20:00:48 -0000      1.2
> --- nscheck.h   24 Jun 2005 08:35:14 -0000      1.3
> ***************
> *** 39,42 ****
> --- 39,43 ----
>   #define NSCHECK_H
>=20
> + #ifndef _WIN32
>=20
>   #undef  __GNUC_PREREQ
> ***************
> *** 109,112 ****
> --- 110,131 ----
>   #endif
>=20
> + #else /* _WIN32 */
> +
> + # define NS_GNUC_SENTINEL
> + # define NS_GNUC_NONNULL
> + # define NS_GNUC_WARN_UNUSED_RESULT
> + # define NS_GNUC_MAYALIAS
> + # define NS_GNUC_DEPRECATED
> + # define NS_GNUC_USED
> + # define NS_GNUC_FORMAT(m)
> + # define NS_GNUC_UNUSED
> + # define NS_GNUC_NORETURN
> + # define NS_GNUC_PRINTF(fmtarg, firstvararg)
> + # define NS_GNUC_SCANF(fmtarg, firstvararg)
> + # define NS_GNUC_MALLOC
> + # define NS_GNUC_PURE
> + # define NS_GNUC_CONST
> +
> + #endif /* _WIN32 */
>=20
>   /*


I think a better fix here would be something like this, right?

#undef  __GNUC_PREREQ
#if defined __GNUC__ && defined __GNUC_MINOR__
# define __GNUC_PREREQ(maj, min) \
        ((__GNUC__ << 16) + __GNUC_MINOR__ >=3D ((maj) << 16) + (min))
+#else
+# define __GNUC_PREREQ(maj, min) (0)
#endif