head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.01.08.20.16.34;	author mk;	state Exp;
branches
	1.1.2.1;
next	;
commitid	TCn7bYirSSiLQPgr;

1.1.2.1
date	2006.01.08.20.16.34;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.53.02;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@modifying package: mtx-1.3.8 20040513 -> 20060108
@
text
@Index: sg_err.c
--- sg_err.c.orig	2002-01-05 01:52:52.000000000 +0100
+++ sg_err.c	2006-01-08 16:28:52.000000000 +0100
@@@@ -21,10 +21,10 @@@@
 
 #define OUTP stderr
 
-static const unsigned char scsi_command_size[8] = { 6, 10, 10, 12,
-                                                   12, 12, 10, 10 };
+static const unsigned char my_scsi_command_size[8] = { 6, 10, 10, 12,
+                                                      12, 12, 10, 10 };
 
-#define COMMAND_SIZE(opcode) scsi_command_size[((opcode) >> 5) & 7]
+#define COMMAND_SIZE(opcode) my_scsi_command_size[((opcode) >> 5) & 7]
 
 static const char unknown[] = "UNKNOWN";
 
@


1.1.2.1
log
@file mtx.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:02 +0000
@
text
@d1 17
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 17
Index: sg_err.c
--- sg_err.c.orig	2002-01-05 01:52:52.000000000 +0100
+++ sg_err.c	2006-01-08 16:28:52.000000000 +0100
@@@@ -21,10 +21,10 @@@@
 
 #define OUTP stderr
 
-static const unsigned char scsi_command_size[8] = { 6, 10, 10, 12,
-                                                   12, 12, 10, 10 };
+static const unsigned char my_scsi_command_size[8] = { 6, 10, 10, 12,
+                                                      12, 12, 10, 10 };
 
-#define COMMAND_SIZE(opcode) scsi_command_size[((opcode) >> 5) & 7]
+#define COMMAND_SIZE(opcode) my_scsi_command_size[((opcode) >> 5) & 7]
 
 static const char unknown[] = "UNKNOWN";
 
@