Jacek Caban : mshtml: Get rid of PRInt16 type.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f071d9b3c1931e8e25cf39db6136a39ceabf9f93
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f071d9b3c1931e8e25cf39db61...

Author: Jacek Caban 
Date:   Fri Jan 18 14:06:09 2013 +0100

mshtml: Get rid of PRInt16 type.

---

dlls/mshtml/nsiface.idl |    3 +--
 dlls/mshtml/txtrange.c  |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 13a156b..8973701 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -45,7 +45,6 @@ typedef nsIIDRef nsCIDRef;
 typedef WCHAR PRUnichar;
 typedef ULONG PRUint32;
 typedef WORD PRUint16;
-typedef INT16 PRInt16;
 typedef BYTE PRUint8;
 typedef LONGLONG PRInt64;
 typedef ULONGLONG PRUint64;
@@ -55,7 +54,7 @@ typedef ULONGLONG PRUint64;
  * more similar to original declarations. Note that it's only a widl trick, we can't
  * use stdint.h types in C.
  */
-#define int16_t PRInt16
+#define int16_t short
 #define int32_t LONG
 #define int64_t PRInt64

diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c
index 42e49b1..085aa84 100644
--- a/dlls/mshtml/txtrange.c
+++ b/dlls/mshtml/txtrange.c
@@ -1236,7 +1236,7 @@ static HRESULT WINAPI HTMLTxtRange_inRange(IHTMLTxtRange *iface, IHTMLTxtRange *
 {
     HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface);
     HTMLTxtRange *src_range;
-    PRInt16 nsret = 0;
+    short nsret = 0;
     nsresult nsres;

TRACE("(%p)->(%p %p)\n", This, Range, InRange);
@@ -1267,7 +1267,7 @@ static HRESULT WINAPI HTMLTxtRange_isEqual(IHTMLTxtRange *iface, IHTMLTxtRange *
 {
     HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface);
     HTMLTxtRange *src_range;
-    PRInt16 nsret = 0;
+    short nsret = 0;
     nsresult nsres;

TRACE("(%p)->(%p %p)\n", This, Range, IsEqual);
@@ -1599,7 +1599,7 @@ static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR h
 {
     HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface);
     HTMLTxtRange *src_range;
-    PRInt16 nsret = 0;
+    short nsret = 0;
     int nscmpt;
     nsresult nsres;