diff -Nru cdrdao-1.2.3.orig//dao/sg_err.cc cdrdao-1.2.3/dao/sg_err.cc
--- cdrdao-1.2.3.orig//dao/sg_err.cc	2009-09-28 12:12:03.000000000 +0200
+++ cdrdao-1.2.3/dao/sg_err.cc	2010-05-30 00:39:42.481766725 +0200
@@ -26,7 +26,7 @@
 static const unsigned char 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) scsi_command_size[((opcode) >> 5) & 7]
 
 static const char unknown[] = "UNKNOWN";
 
@@ -126,7 +126,7 @@
 void sg_print_command (const unsigned char * command) {
     int i,s;
     print_opcode(command[0]);
-    for ( i = 1, s = COMMAND_SIZE(command[0]); i < s; ++i) 
+    for ( i = 1, s = _COMMAND_SIZE(command[0]); i < s; ++i) 
         log_message(0, "%02x ", command[i]);
     log_message(0, "");
 }
@@ -660,5 +660,5 @@
 
 int sg_get_command_size(unsigned char opcode)
 {
-    return COMMAND_SIZE(opcode);
+    return _COMMAND_SIZE(opcode);
 }