[haiku-commits] haiku: hrev44644 - headers/private/shared

  • From: kallisti5@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 15 Sep 2012 22:48:34 +0200 (CEST)

hrev44644 adds 1 changeset to branch 'master'
old head: 8eeafbce5f491129c36c8d1cb42a207816b9f3af
new head: 836394ffbf7964ab46d308fda7be90c5c9f6b06e

----------------------------------------------------------------------------

836394f: PPC: Fix build
  
  * Add a default fallback case for each arch
  * Resolves #8986

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44644
Commit:      836394ffbf7964ab46d308fda7be90c5c9f6b06e
URL:         http://cgit.haiku-os.org/haiku/commit/?id=836394f
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Sat Sep 15 20:44:19 2012 UTC

Ticket:      https://dev.haiku-os.org/ticket/8986

----------------------------------------------------------------------------

1 file changed, 3 insertions(+), 1 deletion(-)
headers/private/shared/cpu_type.h |    4 +++-

----------------------------------------------------------------------------

diff --git a/headers/private/shared/cpu_type.h 
b/headers/private/shared/cpu_type.h
index 7a4f7f6..c945423 100644
--- a/headers/private/shared/cpu_type.h
+++ b/headers/private/shared/cpu_type.h
@@ -192,6 +192,8 @@ get_cpu_model_string(system_info *info)
                        return "604";
                case B_CPU_PPC_604e:
                        return "604e";
+               default:
+                       return NULL;
 #endif /* __POWERPC__ */
 #if __INTEL__
                case B_CPU_x86:
@@ -395,7 +397,6 @@ get_cpu_model_string(system_info *info)
                /* National Semiconductor */
                case B_CPU_NATIONAL_GEODE_GX1:
                        return "Geode GX1";
-#endif /* __INTEL__ */
 
                default:
                        if ((info->cpu_type & B_CPU_x86_VENDOR_MASK) == 
B_CPU_INTEL_x86) {
@@ -404,6 +405,7 @@ get_cpu_model_string(system_info *info)
                                return parse_intel(cpuidName);
                        }
                        return NULL;
+#endif /* __INTEL__ */
        }
 }
 


Other related posts: