*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed Wednesday July 9, 2003 at 05:06:05 PM EDT
+ * It has been AutoGen-ed Saturday July 12, 2003 at 03:37:51 PM EDT
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT CVS-MERGE THIS FILE, EITHER Wed Jul 9 17:06:05 EDT 2003
+/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Jul 12 15:37:51 EDT 2003
*
* You must regenerate it. Use the ./genfixes script.
*
* content selection pattern - do fix if pattern found
*/
tSCC zStruct_SockaddrSelect0[] =
- "^.*authdes_create.*struct sockaddr";
+ "^.*authdes_create.*struct sockaddr[^_]";
/*
* content bypass pattern - skip fix if pattern found
*/
tSCC zStruct_SockaddrBypass0[] =
"<sys/socket.h>";
+tSCC zStruct_SockaddrBypass1[] =
+ "struct sockaddr;\n";
-#define STRUCT_SOCKADDR_TEST_CT 2
+#define STRUCT_SOCKADDR_TEST_CT 3
static tTestDesc aStruct_SockaddrTests[] = {
{ TT_NEGREP, zStruct_SockaddrBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zStruct_SockaddrBypass1, (regex_t*)NULL },
{ TT_EGREP, zStruct_SockaddrSelect0, (regex_t*)NULL }, };
/*
*
* List of all fixes
*/
-#define REGEX_COUNT 172
+#define REGEX_COUNT 173
#define MACH_LIST_SIZE_LIMIT 261
#define FIX_COUNT 154
/*
* IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr
* in prototype without previous definition.
+ *
+ * Don't fix OpenBSD, which uses struct sockaddr_in prototyping the same
+ * function, and does define it.
*/
fix = {
hackname = struct_sockaddr;
files = rpc/auth.h;
- select = "^.*authdes_create.*struct sockaddr";
+ select = "^.*authdes_create.*struct sockaddr[^_]";
bypass = "<sys/socket\.h>";
+ bypass = "struct sockaddr;\n";
c_fix = format;
c_fix_arg = "struct sockaddr;\n%0";
test_text = "extern AUTH* authdes_create( struct sockaddr* );";