Want more features on Pastebin? Sign Up, it's FREE!
Guest

kompozer gcc4.7 patch

By: a guest on Apr 17th, 2012  |  syntax: None  |  size: 4.69 KB  |  views: 86  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. --- a/xpcom/components/nsCategoryCache.cpp      2009-05-02 17:43:38.000000000 +0100
  2. +++ b/xpcom/components/nsCategoryCache.cpp      2012-04-17 12:14:54.000000000 +0100
  3. @@ -42,6 +42,7 @@
  4.  #include "nsObserverService.h"
  5.  
  6.  #include "nsCategoryCache.h"
  7. +#include <unistd.h>
  8.  
  9.  nsCategoryObserver::nsCategoryObserver(const char* aCategory,
  10.                                         nsCategoryListener* aListener)
  11. --- a/xpcom/ds/nsProperties.cpp 2009-05-02 17:43:43.000000000 +0100
  12. +++ b/xpcom/ds/nsProperties.cpp 2012-04-17 12:03:53.000000000 +0100
  13. @@ -38,6 +38,7 @@
  14.  #include "nsProperties.h"
  15.  #include "nsString.h"
  16.  #include "nsCRT.h"
  17. +#include <unistd.h>
  18.  
  19.  ////////////////////////////////////////////////////////////////////////////////
  20.  
  21. --- a/xpcom/ds/nsProperties.h   2009-05-02 17:43:43.000000000 +0100
  22. +++ b/xpcom/ds/nsProperties.h   2012-04-17 11:59:48.000000000 +0100
  23. @@ -43,6 +43,7 @@
  24.  #include "nsInterfaceHashtable.h"
  25.  #include "nsHashKeys.h"
  26.  #include "nsAgg.h"
  27. +#include <unistd.h>
  28.  
  29.  #define NS_PROPERTIES_CID                            \
  30.  { /* 4de2bc90-b1bf-11d3-93b6-00104ba0fd40 */         \
  31. --- a/xpcom/glue/nsBaseHashtable.h      2009-05-02 17:43:39.000000000 +0100
  32. +++ b/xpcom/glue/nsBaseHashtable.h      2012-04-17 12:19:15.000000000 +0100
  33. @@ -41,6 +41,7 @@
  34.  #include "nsTHashtable.h"
  35.  #include "prlock.h"
  36.  #include "nsDebug.h"
  37. +#include <unistd.h>
  38.  
  39.  template<class KeyClass,class DataType,class UserDataType>
  40.  class nsBaseHashtable; // forward declaration
  41. @@ -123,7 +124,7 @@
  42.     */
  43.    PRBool Get(KeyType aKey, UserDataType* pData) const
  44.    {
  45. -    EntryType* ent = GetEntry(aKey);
  46. +    EntryType* ent = this->GetEntry(aKey);
  47.  
  48.      if (!ent)
  49.        return PR_FALSE;
  50. @@ -142,7 +143,7 @@
  51.     */
  52.    PRBool Put(KeyType aKey, UserDataType aData)
  53.    {
  54. -    EntryType* ent = PutEntry(aKey);
  55. +    EntryType* ent = this->PutEntry(aKey);
  56.  
  57.      if (!ent)
  58.        return PR_FALSE;
  59. @@ -156,7 +157,7 @@
  60.     * remove the data for the associated key
  61.     * @param aKey the key to remove from the hashtable
  62.     */
  63. -  void Remove(KeyType aKey) { RemoveEntry(aKey); }
  64. +  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
  65.  
  66.    /**
  67.     * function type provided by the application for enumeration.
  68. --- a/xpcom/glue/nsClassHashtable.h     2009-05-02 17:43:39.000000000 +0100
  69. +++ b/xpcom/glue/nsClassHashtable.h     2012-04-17 11:51:32.000000000 +0100
  70. @@ -98,7 +98,7 @@
  71.  nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
  72.  {
  73.    typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
  74. -    GetEntry(aKey);
  75. +    this->GetEntry(aKey);
  76.  
  77.    if (ent)
  78.    {
  79. @@ -126,7 +126,7 @@
  80.    PR_Lock(this->mLock);
  81.  
  82.    typename nsBaseHashtableMT<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
  83. -    GetEntry(aKey);
  84. +    this->GetEntry(aKey);
  85.  
  86.    if (ent)
  87.    {
  88. --- a/xpcom/glue/nsINIParser.cpp        2009-05-02 17:43:39.000000000 +0100
  89. +++ b/xpcom/glue/nsINIParser.cpp        2012-04-17 11:36:46.000000000 +0100
  90. @@ -45,6 +45,8 @@
  91.  #include <stdlib.h>
  92.  #include <stdio.h>
  93.  
  94. +#include <unistd.h>
  95. +
  96.  #if defined(XP_WIN) || defined(XP_OS2)
  97.  #define BINARY_MODE "b"
  98.  #else
  99. --- a/xpcom/glue/nsInterfaceHashtable.h 2009-05-02 17:43:39.000000000 +0100
  100. +++ b/xpcom/glue/nsInterfaceHashtable.h 2012-04-17 12:06:41.000000000 +0100
  101. @@ -41,6 +41,7 @@
  102.  #include "nsBaseHashtable.h"
  103.  #include "nsHashKeys.h"
  104.  #include "nsCOMPtr.h"
  105. +#include <unistd.h>
  106.  
  107.  /**
  108.   * templated hashtable class maps keys to interface pointers.
  109. @@ -111,7 +112,7 @@
  110.    (KeyType aKey, UserDataType* pInterface) const
  111.  {
  112.    typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
  113. -    GetEntry(aKey);
  114. +    this->GetEntry(aKey);
  115.  
  116.    if (ent)
  117.    {
  118. @@ -139,7 +140,7 @@
  119.    (KeyType aKey, PRBool* aFound) const
  120.  {
  121.    typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
  122. -    GetEntry(aKey);
  123. +    this->GetEntry(aKey);
  124.  
  125.    if (ent)
  126.    {
  127. @@ -167,7 +168,7 @@
  128.    PR_Lock(this->mLock);
  129.  
  130.    typename nsBaseHashtableMT<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
  131. -    GetEntry(aKey);
  132. +    this->GetEntry(aKey);
  133.  
  134.    if (ent)
  135.    {
  136. --- a/xpcom/glue/nsRefPtrHashtable.h    2009-05-02 17:43:39.000000000 +0100
  137. +++ b/xpcom/glue/nsRefPtrHashtable.h    2012-04-17 12:27:52.000000000 +0100
  138. @@ -112,7 +112,7 @@
  139.    (KeyType aKey, UserDataType* pRefPtr) const
  140.  {
  141.    typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
  142. -    GetEntry(aKey);
  143. +    this->GetEntry(aKey);
  144.  
  145.    if (ent)
  146.    {
  147. @@ -140,7 +140,7 @@
  148.    (KeyType aKey, PRBool* aFound) const
  149.  {
  150.    typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
  151. -    GetEntry(aKey);
  152. +    this->GetEntry(aKey);
  153.  
  154.    if (ent)
  155.    {
  156. @@ -168,7 +168,7 @@
  157.    PR_Lock(this->mLock);
  158.  
  159.    typename nsBaseHashtableMT<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
  160. -    GetEntry(aKey);
  161. +    this->GetEntry(aKey);
  162.  
  163.    if (ent)
  164.    {
clone this paste RAW Paste Data