← Back to branch summary

~ubuntu-branches/debian/experimental/kopete/experimental

« back to all changes in this revision

Viewing changes to protocols/jabber/libjingle/patches/06_libjingle_unknown_architecture.patch

  • Committer: Package Import Robot
  • Author(s): Maximiliano Curia
  • Date: 2015-02-24 11:32:57 UTC
  • mfrom: (1.1.41 vivid)
  • Revision ID: package-import@ubuntu.com-20150224113257-gnupg4v7lzz18ij0
Tags: 4:14.12.2-1
* New upstream release (14.12.2).
* Bump Standards-Version to 3.9.6, no changes needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/jabber/libjingle/patches/06_libjingle_unknown_architecture.patch
 
1
--- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
 
2
+++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.cc
 
3
@@ -102,7 +102,7 @@ SystemInfo::SystemInfo()
 
4
 #elif defined(CPU_X86)
 
5
   cpu_arch_ = SI_ARCH_X86;
 
6
 #else
 
7
-#error "Unknown architecture."
 
8
+  cpu_arch_ = SI_ARCH_UNKNOWN;
 
9
 #endif
 
10
 
 
11
 #ifdef WIN32
 
12
@@ -144,8 +144,8 @@ SystemInfo::SystemInfo()
 
13
     proc_info.GetNumCpus(&logical_cpus_);
 
14
     proc_info.GetNumPhysicalCpus(&physical_cpus_);
 
15
     proc_info.GetCpuFamily(&cpu_family_);
 
16
-#if !defined(__arm__)
 
17
-    // These values aren't found on ARM systems.
 
18
+#if defined(CPU_X86)
 
19
+    // These values only apply to x86 systems.
 
20
     proc_info.GetSectionIntValue(0, "model", &cpu_model_);
 
21
     proc_info.GetSectionIntValue(0, "stepping", &cpu_stepping_);
 
22
     proc_info.GetSectionIntValue(0, "cpu MHz", &cpu_speed_);
 
23
--- a/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
 
24
+++ b/protocols/jabber/googletalk/libjingle/talk/base/systeminfo.h
 
25
@@ -37,6 +37,7 @@ namespace talk_base {
 
26
 class SystemInfo {
 
27
  public:
 
28
   enum Architecture {
 
29
+    SI_ARCH_UNKNOWN = -1,
 
30
     SI_ARCH_X86 = 0,
 
31
     SI_ARCH_X64 = 1,
 
32
     SI_ARCH_ARM = 2