Module Name: src Committed By: plunky Date: Sat Sep 15 16:56:06 UTC 2012
Modified Files: src/external/bsd/ipf/dist: opts.h Log Message: the result of the construct #define FOO defined(BAR) #if FOO [conditional code] #endif is "undefined", according to C99 6.10.1 note 4. So, change code like that to use the following paradigm #if defined(BAR) #define FOO 1 #else #define FOO 0 #endif #if FOO [conditional code] #endif To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/opts.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/ipf/dist/opts.h diff -u src/external/bsd/ipf/dist/opts.h:1.2 src/external/bsd/ipf/dist/opts.h:1.3 --- src/external/bsd/ipf/dist/opts.h:1.2 Sun Jul 22 14:27:35 2012 +++ src/external/bsd/ipf/dist/opts.h Sat Sep 15 16:56:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: opts.h,v 1.2 2012/07/22 14:27:35 darrenr Exp $ */ +/* $NetBSD: opts.h,v 1.3 2012/09/15 16:56:05 plunky Exp $ */ /* * Copyright (C) 2012 by Darren Reed. @@ -12,7 +12,11 @@ #define __OPTS_H__ #ifndef SOLARIS -#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) +# if (defined(sun) && (defined(__svr4__) || defined(__SVR4))) +# define SOLARIS 1 +# else +# define SOLARIS 0 +# endif #endif #define OPT_REMOVE 0x000001 #define OPT_DEBUG 0x000002