зеркало из https://github.com/mozilla/pjs.git
Use <> for system headers, not "". This should help prevent Sun WSU2
compiler bustage. Bug 111574, patch from Roland Mainz (<Roland.Mainz@informatik.med.uni-giessen.de>), r=bzbarsky, sr=bienvenu
This commit is contained in:
Родитель
35421e718f
Коммит
0b19fcf775
|
@ -108,7 +108,7 @@
|
|||
|
||||
#ifdef MORK_OBSOLETE
|
||||
#include "xp_file.h"
|
||||
#include "ctype.h"
|
||||
#include <ctype.h>
|
||||
#define MORK_ISPRINT(c) isprint(c)
|
||||
|
||||
#define MORK_FILETELL(file) XP_FileTell(file)
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include "gtkmozembed.h"
|
||||
#include <gtk/gtk.h>
|
||||
#include <string.h>
|
||||
#include "stdlib.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
// mozilla specific headers
|
||||
#include "nsIDOMKeyEvent.h"
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsICookieService.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsXPIDLString.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
|
|
|
@ -46,8 +46,8 @@
|
|||
#ifndef TX_EXE
|
||||
#include "prdtoa.h"
|
||||
#else
|
||||
#include "stdlib.h"
|
||||
#include "stdio.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "ArrayList.h"
|
||||
#include "URIUtils.h"
|
||||
#include "txAtoms.h"
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
|
||||
NodeDefinition::NodeDefinition(NodeType type, const String& name,
|
||||
const String& value, Document* owner)
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "XSLTFunctions.h"
|
||||
#include "Names.h"
|
||||
#ifdef TX_EXE
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#else
|
||||
#include "prprf.h"
|
||||
#endif
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "nscore.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "plstr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsICookieService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIDOMWindowInternal.h"
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "nscore.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "plstr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsIWalletService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIDOMWindowInternal.h"
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "nscore.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "plstr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsIWalletService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIDOMWindowInternal.h"
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "nscore.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "plstr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsReadableUtils.h"
|
||||
#include "nsIWalletService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
// mozLineTerm.cpp: class implementing mozILineTerm/mozILineTermAux interfaces,
|
||||
// providing an XPCOM/XPCONNECT wrapper for the LINETERM module
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include "nspr.h"
|
||||
#include "nscore.h"
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
|
||||
#include "nsIImage.h"
|
||||
|
||||
#include "X11/Xlib.h"
|
||||
#include "X11/Xutil.h"
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include "nsRegion.h"
|
||||
|
||||
|
|
|
@ -1,95 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Netscape.com code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2001
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Brian Stell <bstell@netscape.com>
|
||||
*
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef nsX11AlphaBlend_h__
|
||||
#define nsX11AlphaBlend_h__
|
||||
|
||||
#include "X11/Xlib.h"
|
||||
#include "nsColor.h"
|
||||
|
||||
class nsAntiAliasedGlyph;
|
||||
|
||||
#ifdef DEBUG
|
||||
void AADrawBox(XImage *, PRInt32, PRInt32, PRInt32, PRInt32, nscolor, PRUint8);
|
||||
#endif
|
||||
|
||||
void nsX11AlphaBlendFreeGlobals(void);
|
||||
nsresult nsX11AlphaBlendInitGlobals(Display *dsp);
|
||||
|
||||
|
||||
typedef void (*blendGlyph)(XImage *, nsAntiAliasedGlyph *, PRUint8*,
|
||||
nscolor, int, int);
|
||||
typedef void (*blendPixel)(XImage *, int, int, nscolor, int);
|
||||
typedef nscolor (*pixelToNSColor)(unsigned long aPixel);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// class nsX11AlphaBlend class definition
|
||||
//
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
class nsX11AlphaBlend {
|
||||
public:
|
||||
inline static PRBool CanAntiAlias() { return sAvailable; };
|
||||
inline static blendPixel GetBlendPixel() { return sBlendPixel; };
|
||||
inline static blendGlyph GetBlendGlyph() { return sBlendMonoImage; };
|
||||
|
||||
static XImage* GetXImage(PRUint32 width, PRUint32 height);
|
||||
static void FreeGlobals();
|
||||
static nsresult InitGlobals(Display *dsp);
|
||||
static XImage* GetBackground(Display *, int, Drawable,
|
||||
PRInt32, PRInt32, PRUint32, PRUint32);
|
||||
static nscolor PixelToNSColor(unsigned long aPixel);
|
||||
|
||||
protected:
|
||||
static void ClearGlobals();
|
||||
static void ClearFunctions();
|
||||
static PRBool InitLibrary(Display *dsp);
|
||||
|
||||
static PRBool sAvailable;
|
||||
static PRUint16 sBitmapPad;
|
||||
static PRUint16 sBitsPerPixel;
|
||||
static blendGlyph sBlendMonoImage;
|
||||
static blendPixel sBlendPixel;
|
||||
static PRUint16 sBytesPerPixel;
|
||||
static int sDepth;
|
||||
static PRBool sInited;
|
||||
static pixelToNSColor sPixelToNSColor;
|
||||
};
|
||||
|
||||
#endif /* nsX11AlphaBlend_h__ */
|
|
@ -41,7 +41,7 @@
|
|||
#include "nsPhGfxLog.h"
|
||||
#include "nsDeviceContextPh.h"
|
||||
#include "nspr.h"
|
||||
#include "errno.h"
|
||||
#include <errno.h>
|
||||
#include <Pt.h>
|
||||
#include <photon/PxImage.h>
|
||||
#include "photon/PhRender.h"
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
#include "nsFontMetricsXlib.h"
|
||||
|
||||
#include "xlibrgb.h"
|
||||
#include "X11/Xatom.h"
|
||||
#include <X11/Xatom.h>
|
||||
|
||||
#include "nsDeviceContextSpecXlib.h"
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "xp_core.h" //this is a hack to get it to build. MMP
|
||||
#include "nscore.h"
|
||||
#include "nsIFactory.h"
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
|
||||
#include "nsParserNode.h"
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
#include "nsHTMLTokens.h"
|
||||
#include "nsITokenizer.h"
|
||||
#include "nsDTDUtils.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef IMPORT_DEBUG
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#define IMPORT_LOG0( x) printf( x)
|
||||
#define IMPORT_LOG1( x, y) printf( x, y)
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
*/
|
||||
|
||||
#ifdef IMPORT_DEBUG
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#define IMPORT_LOG0( x) printf( x)
|
||||
#define IMPORT_LOG1( x, y) printf( x, y)
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
*/
|
||||
|
||||
#ifdef MAPI_DEBUG
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#define MAPI_DUMP_STRING( x) printf( "%s", (const char *)x)
|
||||
#define MAPI_TRACE0( x) printf( x)
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef IMPORT_DEBUG
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#define IMPORT_LOG0( x) printf( x)
|
||||
#define IMPORT_LOG1( x, y) printf( x, y)
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef IMPORT_DEBUG
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#define IMPORT_LOG0( x) printf( x)
|
||||
#define IMPORT_LOG1( x, y) printf( x, y)
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nscore.h"
|
||||
#include "plstr.h"
|
||||
#include "prtypes.h"
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "nsCOMPtr.h"
|
||||
#include "nsXPIDLString.h"
|
||||
#include "nsReadableUtils.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsMimeBaseEmitter.h"
|
||||
#include "nsMailHeaders.h"
|
||||
#include "nscore.h"
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "nsCOMPtr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsMimeRebuffer.h"
|
||||
#include "nsMimeHtmlEmitter.h"
|
||||
#include "plstr.h"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "nsCOMPtr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsMimeRebuffer.h"
|
||||
#include "nsMimeRawEmitter.h"
|
||||
#include "plstr.h"
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "msgCore.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsMimeXULEmitter.h"
|
||||
#include "plstr.h"
|
||||
#include "nsIMimeEmitter.h"
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsMimeRebuffer.h"
|
||||
#include "nsMimeXmlEmitter.h"
|
||||
#include "plstr.h"
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "modmimee.h"
|
||||
#include "mimei.h"
|
||||
#include "nsCRT.h"
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "mimecom.h"
|
||||
#include "modmimee.h"
|
||||
#include "nscore.h"
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "mimecom.h"
|
||||
#include "nscore.h"
|
||||
#include "nsMimeObjectClassAccess.h"
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "nsCOMPtr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "mimecom.h"
|
||||
#include "modmimee.h"
|
||||
#include "nscore.h"
|
||||
|
|
|
@ -26,8 +26,8 @@
|
|||
#include "ojiapitests.h"
|
||||
#include "testtypes.h"
|
||||
|
||||
#include "sys/stat.h"
|
||||
#include "string.h"
|
||||
#include <sys/stat.h>
|
||||
#include <string.h>
|
||||
|
||||
#define OJITESTLOADER_IID \
|
||||
{ /* a1e5ed51-aa4a-11d1-85b2-00805f0e4dfe */ \
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "nsIPref.h"
|
||||
#include "nsICacheVisitor.h"
|
||||
#include "nsITransport.h"
|
||||
#include "signal.h"
|
||||
#include <signal.h>
|
||||
|
||||
|
||||
static NS_DEFINE_CID(kStorageTransportCID, NS_STORAGETRANSPORT_CID);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
|
||||
#include "nsParserNode.h"
|
||||
#include "string.h"
|
||||
#include <string.h>
|
||||
#include "nsHTMLTokens.h"
|
||||
#include "nsITokenizer.h"
|
||||
#include "nsDTDUtils.h"
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
#include "nsXPIDLString.h"
|
||||
|
||||
#ifdef NS_DEBUG
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#endif
|
||||
|
||||
#define NC_RDF_Name NC_NAMESPACE_URI "Name"
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include "resources.h"
|
||||
#include "nscore.h"
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
int MenuItemActivate (PtWidget_t *widget, void *command, PtCallbackInfo_t *cbinfo)
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include "resources.h"
|
||||
#include "nscore.h"
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
typedef GtkItemFactoryCallback GIFC;
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "nsQtMenu.h"
|
||||
#include "resources.h"
|
||||
#include "nscore.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
nsMenuEventHandler::nsMenuEventHandler(nsBrowserWindow * window)
|
||||
{
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "nscore.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "plstr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include "nsSound.h"
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include "nsGtkIMEHelper.h"
|
||||
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include "gtk/gtk.h"
|
||||
#include "nsGtkEventHandler.h"
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
#ifdef DBG_JCG
|
||||
/* Required for x11EventFilter & _x_error debugging hooks */
|
||||
#include "X11/Xlib.h"
|
||||
#include <X11/Xlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
PRInt32 gQAppID = 0;
|
||||
|
|
|
@ -46,8 +46,8 @@
|
|||
#include <nsCOMPtr.h>
|
||||
#include "nsWidget.h"
|
||||
|
||||
#include "X11/X.h"
|
||||
#include "X11/Xlib.h"
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
class nsITransferable;
|
||||
class nsIClipboardOwner;
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
*
|
||||
*/
|
||||
#include "plstr.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include "nsSample.h"
|
||||
#include "nsMemory.h"
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include "nsSpecialSystemDirectory.h"
|
||||
#include "prprf.h"
|
||||
|
||||
//#include "string.h"
|
||||
//#include <string.h>
|
||||
//void* operator new(size_t n) { return malloc(n); }
|
||||
|
||||
struct FilesTest
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "nsILocalFile.h"
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsMemory.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "nsILocalFile.h"
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIMemory.h"
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
#include "nsIDOMInstallVersion.h"
|
||||
|
||||
#include "stdio.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef _WINDOWS
|
||||
#include "nsJSWinReg.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче