Changeset 13614

Timestamp:

10/28/08 13:52:20 (2 months ago)

Author:

vboxsync

Message:

backed out previous accidental commit

Files:

• trunk/Config.kmk (modified) (1 diff)
• trunk/include/VBox/scsi.h (modified) (1 diff)
• trunk/src/libs/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -359 +359 @@
-# (Current not enabled by default because all the build servers has
-# different Python versions installed and would start burning.)
-darwin 
+
- VBOX_WITH_PYTHON = 1
-endif

trunk/include/VBox/scsi.h

@@ -126 +126 @@
-
-
-/* Status codes */
-#define SCSI_STATUS_OK                          0x00
-#define SCSI_STATUS_CHECK_CONDITION             0x02
-#define SCSI_STATUS_CONDITION_MET               0x04
-#define SCSI_STATUS_BUSY                        0x08
-#define SCSI_STATUS_INTERMEDIATE                0x10
-#define SCSI_STATUS_DATA_UNDEROVER_RUN          0x12
-#define SCSI_STATUS_INTERMEDIATE_CONDITION_MET  0x14
-#define SCSI_STATUS_RESERVATION_CONFLICT        0x18
-#define SCSI_STATUS_COMMAND_TERMINATED          0x22
-#define SCSI_STATUS_QUEUE_FULL                  0x28
-#define SCSI_STATUS_ACA_ACTIVE                  0x30
-#define SCSI_STATUS_TASK_ABORTED                0x40
-
-
-/* Sense keys */
-#define SCSI_SENSE_NONE             0

trunk/src/libs/Makefile.kmk

@@ -75 +75 @@
- endif
-
-
+ 
-
-include $(KBUILD_PATH)/subfooter.kmk
@@ -119 +119 @@
- ifndef VBOX_OSE
-  ifdef VBOX_WITH_FFMPEG
- linux
+
-    subdirs += ffmpeg-20060710
-   endif