← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge

« back to all changes in this revision

Viewing changes to lib/user/util.c

  • Committer: Nate Muench
  • Date: 2012-03-22 17:50:13 UTC
  • mfrom: (1.4.7)
  • Revision ID: nowiwilldestroyabydos@gmail.com-20120322175013-0jh30wfk7ut20rdj
Tags: 2012.03.13-651368-0ubuntu1
* Merge latest upstream git tag.
* debian/rules: Removed glib2.0 compatibility CFLAG.
  - Packaging can now build without it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/user/util.c
54
54
#  include <dlfcn.h>
55
55
#endif
56
56
 
57
 
#if defined(__linux__) && !defined(VMX86_TOOLS)
 
57
#if defined(__linux__) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
58
58
#  include <link.h>
59
59
#endif
60
60
 
428
428
   return _URC_END_OF_STACK;
429
429
}
430
430
 
431
 
#if !defined(_WIN32) && !defined(VMX86_TOOLS)
 
431
#if !defined(_WIN32) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
432
432
/*
433
433
 *-----------------------------------------------------------------------------
434
434
 *
575
575
#elif !defined(VM_X86_64)
576
576
   uintptr_t *x = basePtr;
577
577
   int i;
578
 
#if !defined(_WIN32) && !defined(VMX86_TOOLS)
 
578
#if !defined(_WIN32) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
579
579
   Dl_info dli;
580
580
#endif
581
581
 
588
588
      x = (uintptr_t *) x[0];
589
589
   }
590
590
 
591
 
#if !defined(_WIN32) && !defined(VMX86_TOOLS)
 
591
#if !defined(_WIN32) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
592
592
   /* 
593
593
    * We do a separate pass here that includes symbols in order to
594
594
    * make sure the base backtrace that does not call dladdr() etc.