include nsresult typedef

xpcom/base/nsrootidl.idl

@@ -35,6 +35,7 @@ typedef long                PRInt32  ;
 typedef long long           PRInt64  ;
 
 typedef unsigned long       nsrefcnt ;
+typedef unsigned long       nsresult ;
 
 [ptr]         native voidStar(void);
 [ref]         native voidRef(void);

xpcom/idl/nsrootidl.idl

@@ -1,57 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-/* Root idl declarations to be used by all. */
-
-%{C++
-/* 
- * Start commenting out the C++ versions of the below in the output header
- */
-#if 0
-%}
-
-typedef boolean             PRBool   ;
-typedef octet               PRUint8  ;
-typedef unsigned short      PRUint16 ;
-typedef unsigned long       PRUint32 ;
-typedef unsigned long long  PRUint64 ;
-typedef short               PRInt16  ;
-typedef long                PRInt32  ;
-typedef long long           PRInt64  ;
-
-typedef unsigned long       nsrefcnt ;
-
-[ptr]         native voidStar(void);
-[ref]         native voidRef(void);
-
-[ref, nsid]   native nsIDRef(nsID);
-[ref, nsid]   native nsIIDRef(nsIID);
-[ref, nsid]   native nsCIDRef(nsCID);
-
-[ptr, nsid]   native nsIDPtr(nsID);
-[ptr, nsid]   native nsIIDPtr(nsIID);
-[ptr, nsid]   native nsCIDPtr(nsCID);
-
-[ptr]         native nsQIResult(void);
-
-%{C++
-/* 
- * End commenting out the C++ versions of the above in the output header
- */
-#endif
-%}