[haiku-commits] r41095 - in haiku/trunk/src/add-ons/accelerants/radeon_hd: . atombios atombios/includes
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 24 Mar 2011 03:02:03 +0100 (CET)
Author: kallisti5
Date: 2011-03-24 03:02:02 +0100 (Thu, 24 Mar 2011)
New Revision: 41095
Changeset: https://dev.haiku-os.org/changeset/41095
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
Log:
reduce changes on vendor sources, reverted and reworked; put Decoder.c back to
stock moving define into Jamfile; put single ifdef wraper around un-needed
typedefs; Move SubInclude to bottom of Jamfile;
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile 2011-03-23
21:28:14 UTC (rev 41094)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/Jamfile 2011-03-24
02:02:02 UTC (rev 41095)
@@ -1,7 +1,5 @@
SubDir HAIKU_TOP src add-ons accelerants radeon_hd ;
-SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
-
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders graphics ;
@@ -16,7 +14,4 @@
: be libaccelerantscommon.a atombios.a
;
-Package haiku-radeon_hd-cvs :
- radeon_hd.accelerant :
- boot home config add-ons accelerants ;
-
+SubInclude HAIKU_TOP src add-ons accelerants radeon_hd atombios ;
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
2011-03-23 21:28:14 UTC (rev 41094)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Decoder.c
2011-03-24 02:02:02 UTC (rev 41095)
@@ -40,9 +40,6 @@
#include "CD_binding.h"
#include "CD_Common_Types.h"
-
-#define DISABLE_EASF
-
#ifndef DISABLE_EASF
#include "easf.h"
#endif
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
2011-03-23 21:28:14 UTC (rev 41094)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/Jamfile
2011-03-24 02:02:02 UTC (rev 41095)
@@ -5,8 +5,9 @@
UsePrivateHeaders [ FDirName graphics radeon_hd ] ;
UsePrivateHeaders [ FDirName graphics common ] ;
+DEFINES += DISABLE_EASF ;
+
StaticLibrary atombios.a :
Decoder.c
CD_Operations.c
;
-
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
===================================================================
---
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
2011-03-23 21:28:14 UTC (rev 41094)
+++
haiku/trunk/src/add-ons/accelerants/radeon_hd/atombios/includes/CD_Common_Types.h
2011-03-24 02:02:02 UTC (rev 41095)
@@ -37,11 +37,42 @@
#ifndef _COMMON_TYPES_H_
#define _COMMON_TYPES_H_
-#if defined (__HAIKU__)
- // It's how we roll
- #include <stdint.h>
+// HAIKU_ADDITION START IF
+#if defined(__HAIKU__)
+ #include <stdint.h>
+#else
+ #ifndef LINUX
+ #if _MSC_EXTENSIONS
+
+ //
+ // use Microsoft* C complier dependent interger width types
+ //
+ // typedef unsigned __int64 uint64_t;
+ // typedef __int64 int64_t;
+ typedef unsigned __int32 uint32_t;
+ typedef __int32 int32_t;
+#elif defined (__linux__) || defined (__NetBSD__) \
+ || defined(__sun) || defined(__OpenBSD__) \
+ || defined (__FreeBSD__) || defined(__DragonFly__) || defined(__GLIBC__)
+ typedef unsigned int uint32_t;
+ typedef int int32_t;
+ #else
+ typedef unsigned long uint32_t;
+ typedef signed long int32_t;
+ #endif
+ typedef unsigned char uint8_t;
+#if (defined(__sun) && defined(_CHAR_IS_SIGNED))
+ typedef char int8_t;
+#else
+ typedef signed char int8_t;
#endif
+ typedef unsigned short uint16_t;
+ typedef signed short int16_t;
+ #endif
+#endif
+// HAIKU_ADDITION ENDIF
+
#ifndef UEFI_BUILD
typedef signed int intn_t;
typedef unsigned int uintn_t;
@@ -51,6 +82,9 @@
typedef unsigned int uintn_t;
#endif
#endif
+#ifndef FGL_LINUX
+#pragma warning ( disable : 4142 )
+#endif
#ifndef VOID
@@ -122,6 +156,9 @@
//typedef UINTN CD_STATUS;
+#ifndef FGL_LINUX
+#pragma warning ( default : 4142 )
+#endif
#endif // _COMMON_TYPES_H_
// EOF
Other related posts:
- » [haiku-commits] r41095 - in haiku/trunk/src/add-ons/accelerants/radeon_hd: . atombios atombios/includes - kallisti5
