update to use ns_quicksort so that this branch builds

git-svn-id: svn://10.0.0.236/branches/FAST-GTK-GFX@31772 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/gfx/src/gtk/Makefile.in

@@ -0,0 +1,53 @@
+#!gmake
+#
+# 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.
+
+DEPTH = ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = gfxgtk
+
+MODULE=raptor 
+
+REQUIRES=util img xpcom raptor netlib ps
+
+DEFINES += -D_IMPL_NS_GFXONXP 
+CXXFLAGS += $(TK_CFLAGS)
+INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
+
+CPPSRCS = \
+	nsDrawingSurfaceGTK.cpp \
+	nsDeviceContextGTK.cpp \
+	nsDeviceContextSpecFactoryG.cpp \
+	nsDeviceContextSpecG.cpp \
+	nsFontMetricsGTK.cpp \
+	nsGfxFactoryGTK.cpp \
+	nsRenderingContextGTK.cpp \
+	nsImageGTK.cpp \
+	nsRegionGTK.cpp 
+
+CSRCS = \
+	nsPrintdGTK.c
+
+include $(topsrcdir)/config/rules.mk
+
+

mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp

@@ -0,0 +1,375 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#include <math.h>
+
+#include "nspr.h"
+#include "il_util.h"
+
+#include "nsDeviceContextGTK.h"
+#include "nsGfxCIID.h"
+
+#include "../ps/nsDeviceContextPS.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define NS_TO_GDK_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
+
+#define GDK_COLOR_TO_NS_RGB(c) \
+  ((nscolor) NS_RGB(c.red, c.green, c.blue))
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID);
+
+nsDeviceContextGTK::nsDeviceContextGTK()
+{
+  NS_INIT_REFCNT();
+  mTwipsToPixels = 1.0;
+  mPixelsToTwips = 1.0;
+  mDepth = 0 ;
+  mPaletteInfo.isPaletteDevice = PR_FALSE;
+  mPaletteInfo.sizePalette = 0;
+  mPaletteInfo.numReserved = 0;
+  mPaletteInfo.palette = NULL;
+  mNumCells = 0;
+}
+
+nsDeviceContextGTK::~nsDeviceContextGTK()
+{
+}
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextGTK, kDeviceContextIID)
+NS_IMPL_ADDREF(nsDeviceContextGTK)
+NS_IMPL_RELEASE(nsDeviceContextGTK)
+
+NS_IMETHODIMP nsDeviceContextGTK::Init(nsNativeWidget aNativeWidget)
+{
+  GdkVisual *vis;
+  GtkRequisition req;
+  GtkWidget *sb;
+
+  mWidget = aNativeWidget;
+
+  // Compute dpi of display
+  float screenWidth = float(::gdk_screen_width());
+  float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
+  nscoord dpi = nscoord(screenWidth / screenWidthIn);
+
+  // Now for some wacky heuristics. 
+  if (dpi < 84) dpi = 72;
+  else if (dpi < 108) dpi = 96;
+  else if (dpi < 132) dpi = 120;
+
+  mTwipsToPixels = float(dpi) / float(NSIntPointsToTwips(72));
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+
+#if 0
+  mTwipsToPixels = ( ((float)::gdk_screen_width()) /
+                     ((float)::gdk_screen_width_mm()) * 25.4) /
+		     (float)NSIntPointsToTwips(72);
+
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+#endif
+
+  vis = gdk_rgb_get_visual();
+  mDepth = vis->depth;
+
+  sb = gtk_vscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarWidth = req.width;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+  
+  sb = gtk_hscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarHeight = req.height;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+
+#ifdef DEBUG
+  static PRBool once = PR_TRUE;
+  if (once) {
+    printf("GFX: dpi=%d t2p=%g p2t=%g depth=%d\n", dpi, mTwipsToPixels, mPixelsToTwips,mDepth);
+    once = PR_FALSE;
+  }
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::CreateRenderingContext(nsIRenderingContext *&aContext)
+{
+  nsIRenderingContext *pContext;
+  nsresult             rv;
+  nsDrawingSurfaceGTK  *surf;
+
+  // to call init for this, we need to have a valid nsDrawingSurfaceGTK created
+  pContext = new nsRenderingContextGTK();
+
+  if (nsnull != pContext)
+  {
+    NS_ADDREF(pContext);
+
+    // create the nsDrawingSurfaceGTK
+    surf = new nsDrawingSurfaceGTK();
+
+    if (nsnull != surf)
+      {
+        GdkDrawable *win = nsnull;
+        // FIXME
+        if (GTK_IS_LAYOUT((GtkWidget*)mWidget))
+          win = (GdkDrawable*)gdk_window_ref(GTK_LAYOUT((GtkWidget*)mWidget)->bin_window);
+        else
+          win = (GdkDrawable*)gdk_window_ref(((GtkWidget*)mWidget)->window);
+
+        GdkGC *gc = gdk_gc_new(win);
+
+        // init the nsDrawingSurfaceGTK
+        rv = surf->Init(win,gc);
+
+        if (NS_OK == rv)
+          // Init the nsRenderingContextGTK
+          rv = pContext->Init(this, surf);
+      }
+    else
+      rv = NS_ERROR_OUT_OF_MEMORY;
+  }
+  else
+    rv = NS_ERROR_OUT_OF_MEMORY;
+
+  if (NS_OK != rv)
+  {
+    NS_IF_RELEASE(pContext);
+  }
+
+  aContext = pContext;
+
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::SupportsNativeWidgets(PRBool &aSupportsWidgets)
+{
+  //XXX it is very critical that this not lie!! MMP
+  // read the comments in the mac code for this
+  aSupportsWidgets = PR_TRUE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetScrollBarDimensions(float &aWidth, float &aHeight) const
+{
+  aWidth = mScrollbarWidth * mPixelsToTwips;
+  aHeight = mScrollbarHeight * mPixelsToTwips;
+ 
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const
+{
+  nsresult status = NS_OK;
+  GtkStyle *style = gtk_style_new();  // get the default styles
+
+  switch (anID) {
+    //---------
+    // Colors
+    //---------
+    case eSystemAttr_Color_WindowBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WindowForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_WidgetSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_Widget3DHighlight:
+        *aInfo->mColor = NS_RGB(0xa0,0xa0,0xa0);
+        break;
+    case eSystemAttr_Color_Widget3DShadow:
+        *aInfo->mColor = NS_RGB(0x40,0x40,0x40);
+        break;
+    case eSystemAttr_Color_TextBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextForeground: 
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_TextSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->text[GTK_STATE_SELECTED]);
+        break;
+    //---------
+    // Size
+    //---------
+    case eSystemAttr_Size_ScrollbarHeight:
+        aInfo->mSize = mScrollbarHeight;
+        break;
+    case eSystemAttr_Size_ScrollbarWidth: 
+        aInfo->mSize = mScrollbarWidth;
+        break;
+    case eSystemAttr_Size_WindowTitleHeight:
+        aInfo->mSize = 0;
+        break;
+    case eSystemAttr_Size_WindowBorderWidth:
+        aInfo->mSize = style->klass->xthickness;
+        break;
+    case eSystemAttr_Size_WindowBorderHeight:
+        aInfo->mSize = style->klass->ythickness;
+        break;
+    case eSystemAttr_Size_Widget3DBorder:
+        aInfo->mSize = 4;
+        break;
+    //---------
+    // Fonts
+    //---------
+    case eSystemAttr_Font_Caption:
+    case eSystemAttr_Font_Icon:
+    case eSystemAttr_Font_Menu:
+    case eSystemAttr_Font_MessageBox:
+    case eSystemAttr_Font_SmallCaption:
+    case eSystemAttr_Font_StatusBar:
+    case eSystemAttr_Font_Tooltips:
+    case eSystemAttr_Font_Widget:
+      status = NS_ERROR_FAILURE;
+      break;
+  } // switch
+
+  gtk_style_unref(style);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDrawingSurface(nsIRenderingContext &aContext, 
+                                                    nsDrawingSurface &aSurface)
+{
+  aContext.CreateDrawingSurface(nsnull, 0, aSurface);
+  return nsnull == aSurface ? NS_ERROR_OUT_OF_MEMORY : NS_OK;  
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::ConvertPixel(nscolor aColor, 
+                                               PRUint32 & aPixel)
+{
+  aPixel = ::gdk_rgb_xpixel_from_rgb (NS_TO_GDK_RGB(aColor));
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsDeviceContextGTK::CheckFontExistence(const nsString& aFontName)
+{
+  char        **fnames = nsnull;
+  PRInt32     namelen = aFontName.Length() + 1;
+  char        *wildstring = (char *)PR_Malloc(namelen + 200);
+  float       t2d;
+  GetTwipsToDevUnits(t2d);
+  PRInt32     dpi = NSToIntRound(t2d * 1440);
+  int         numnames = 0;
+  XFontStruct *fonts;
+  nsresult    rv = NS_ERROR_FAILURE;
+  
+  if (nsnull == wildstring)
+    return NS_ERROR_UNEXPECTED;
+  
+  if (abs(dpi - 75) < abs(dpi - 100))
+    dpi = 75;
+  else
+    dpi = 100;
+  
+  char* fontName = aFontName.ToNewCString();
+  PR_snprintf(wildstring, namelen + 200,
+             "*-%s-*-*-normal--*-*-%d-%d-*-*-*",
+             fontName, dpi, dpi);
+  delete [] fontName;
+  
+  fnames = ::XListFontsWithInfo(GDK_DISPLAY(), wildstring, 1, &numnames, &fonts);
+  
+  if (numnames > 0)
+  {
+    ::XFreeFontInfo(fnames, fonts, numnames);
+    rv = NS_OK;
+  }
+  
+  PR_Free(wildstring);
+  
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight)
+{
+  aWidth = 1;
+  aHeight = 1;
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                                      nsIDeviceContext *&aContext)
+{
+  // Create a Postscript device context 
+  aContext = new nsDeviceContextPS();
+  ((nsDeviceContextPS *)aContext)->SetSpec(aDevice);
+  NS_ADDREF(aDevice);
+  return((nsDeviceContextPS *) aContext)->Init((nsIDeviceContext*)aContext, (nsIDeviceContext*)this);
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDepth(PRUint32& aDepth)
+{
+  GdkVisual * rgb_visual = gdk_rgb_get_visual();
+
+  gint rgb_depth = rgb_visual->depth;
+
+  aDepth = (PRUint32) rgb_depth;
+
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsDeviceContextGTK.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsDeviceContextGTK_h___
+#define nsDeviceContextGTK_h___
+
+#include "nsDeviceContext.h"
+#include "nsUnitConversion.h"
+#include "nsIWidget.h"
+#include "nsIView.h"
+#include "nsIRenderingContext.h"
+
+#include "nsRenderingContextGTK.h"
+
+class nsDeviceContextGTK : public DeviceContextImpl
+{
+public:
+  nsDeviceContextGTK();
+  virtual ~nsDeviceContextGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(nsNativeWidget aNativeWidget);
+
+  NS_IMETHOD  CreateRenderingContext(nsIRenderingContext *&aContext);
+  NS_IMETHOD  SupportsNativeWidgets(PRBool &aSupportsWidgets);
+
+  NS_IMETHOD  GetScrollBarDimensions(float &aWidth, float &aHeight) const;
+  NS_IMETHOD  GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const;
+
+  //get a low level drawing surface for rendering. the rendering context
+  //that is passed in is used to create the drawing surface if there isn't
+  //already one in the device context. the drawing surface is then cached
+  //in the device context for re-use.
+
+  NS_IMETHOD GetDrawingSurface(nsIRenderingContext &aContext, nsDrawingSurface &aSurface);
+
+  NS_IMETHOD ConvertPixel(nscolor aColor, PRUint32 & aPixel);
+  NS_IMETHOD CheckFontExistence(const nsString& aFontName);
+
+  NS_IMETHOD GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight);
+
+  NS_IMETHOD GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                 nsIDeviceContext *&aContext);
+
+  NS_IMETHOD BeginDocument(void);
+  NS_IMETHOD EndDocument(void);
+
+  NS_IMETHOD BeginPage(void);
+  NS_IMETHOD EndPage(void);
+
+  NS_IMETHOD GetDepth(PRUint32& aDepth);
+
+private:
+  PRUint32      mDepth;
+  PRBool        mWriteable;
+  nsPaletteInfo mPaletteInfo;
+  PRUint32 mNumCells;
+  PRInt16 mScrollbarHeight;
+  PRInt16 mScrollbarWidth;
+};
+
+#endif /* nsDeviceContextGTK_h___ */
+

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDeviceContextSpecFactoryG.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsGfxCIID.h"
+#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Constructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: nsDeviceContextSpecFactoryGTK()
+{
+}
+
+/** -------------------------------------------------------
+ *  Destructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: ~nsDeviceContextSpecFactoryGTK()
+{
+}
+
+static NS_DEFINE_IID(kDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID);
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecFactoryGTK, kDeviceContextSpecFactoryIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecFactoryGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecFactoryGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the device context spec factory
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: Init(void)
+{
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ *  Get a device context specification
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                                                       nsIDeviceContextSpec *&aNewSpec,
+                                                                       PRBool aQuiet)
+{
+nsresult  						rv = NS_ERROR_FAILURE;
+nsIDeviceContextSpec  *devSpec = nsnull;
+
+	nsComponentManager::CreateInstance(kDeviceContextSpecCID, nsnull, kIDeviceContextSpecIID, (void **)&devSpec);
+
+	if (nsnull != devSpec){
+	  if (NS_OK == ((nsDeviceContextSpecGTK *)devSpec)->Init(aQuiet)){
+	    aNewSpec = devSpec;
+	    rv = NS_OK;
+	  }
+	}
+	return rv;
+}

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.h

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextSpecFactoryG_h___
+#define nsDeviceContextSpecFactoryG_h___
+
+#include "nsIDeviceContextSpecFactory.h"
+#include "nsIDeviceContextSpec.h"
+
+class nsDeviceContextSpecFactoryGTK : public nsIDeviceContextSpecFactory
+{
+public:
+  nsDeviceContextSpecFactoryGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(void);
+  NS_IMETHOD CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                     nsIDeviceContextSpec *&aNewSpec,
+                                     PRBool aQuiet);
+
+protected:
+  virtual ~nsDeviceContextSpecFactoryGTK();
+};
+
+#endif

mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp

@@ -0,0 +1,197 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#include "nsDeviceContextSpecG.h"
+#include "prenv.h" /* for PR_GetEnv */
+
+//#include "prmem.h"
+//#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Construct the nsDeviceContextSpecGTK
+ *  @update   dc 12/02/98
+ */
+nsDeviceContextSpecGTK :: nsDeviceContextSpecGTK()
+{
+  NS_INIT_REFCNT();
+	
+}
+
+/** -------------------------------------------------------
+ *  Destroy the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ */
+nsDeviceContextSpecGTK :: ~nsDeviceContextSpecGTK()
+{
+}
+
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecPSIID, NS_IDEVICE_CONTEXT_SPEC_PS_IID);
+
+#if 0
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecGTK, kDeviceContextSpecIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+#endif
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDeviceContextSpecIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDeviceContextSpecPSIID))
+  {
+    nsIDeviceContextSpecPS* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ *  @update   syd 3/2/99
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: Init(PRBool	aQuiet)
+{
+  char *path;
+
+  // XXX these settings should eventually come out of preferences 
+
+  mPrData.toPrinter = PR_TRUE;
+  mPrData.fpf = PR_TRUE;
+  mPrData.grayscale = PR_FALSE;
+  mPrData.size = NS_LETTER_SIZE;
+  sprintf( mPrData.command, "lpr" );
+
+  // PWD, HOME, or fail 
+
+  if ( ( path = PR_GetEnv( "PWD" ) ) == (char *) NULL ) 
+	if ( ( path = PR_GetEnv( "HOME" ) ) == (char *) NULL )
+  		strcpy( mPrData.path, "netscape.ps" );
+  if ( path != (char *) NULL )
+	sprintf( mPrData.path, "%s/netscape.ps", path );
+  else
+	return NS_ERROR_FAILURE;
+
+  ::UnixPrDialog( &mPrData );
+  if ( mPrData.cancel == PR_TRUE ) 
+	return NS_ERROR_FAILURE;
+  else
+        return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetToPrinter( PRBool &aToPrinter )     
+{
+  aToPrinter = mPrData.toPrinter;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetFirstPageFirst ( PRBool &aFpf )      
+{
+  aFpf = mPrData.fpf;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetGrayscale ( PRBool &aGrayscale )      
+{
+  aGrayscale = mPrData.grayscale;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetSize ( int &aSize )      
+{
+  aSize = mPrData.size;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetTopMargin ( float &value )      
+{
+  value = mPrData.top;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetBottomMargin ( float &value )      
+{
+  value = mPrData.bottom;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetRightMargin ( float &value )      
+{
+  value = mPrData.right;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetLeftMargin ( float &value )      
+{
+  value = mPrData.left;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetCommand ( char **aCommand )      
+{
+  *aCommand = &mPrData.command[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetPath ( char **aPath )      
+{
+  *aPath = &mPrData.path[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetUserCancelled( PRBool &aCancel )     
+{
+  aCancel = mPrData.cancel;
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ * Closes the printmanager if it is open.
+ *  @update   dc 2/15/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: ClosePrintManager()
+{
+	return NS_OK;
+}  

mozilla/gfx/src/gtk/nsDeviceContextSpecG.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsDeviceContextSpecG_h___
+#define nsDeviceContextSpecG_h___
+
+#include "nsIDeviceContextSpec.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsIDeviceContextSpecPS.h"
+
+#include "nsPrintdGTK.h"
+
+class nsDeviceContextSpecGTK : public nsIDeviceContextSpec ,
+                                      public nsIDeviceContextSpecPS
+{
+public:
+/**
+ * Construct a nsDeviceContextSpecMac, which is an object which contains and manages a mac printrecord
+ * @update  dc 12/02/98
+ */
+  nsDeviceContextSpecGTK();
+
+  NS_DECL_ISUPPORTS
+
+/**
+ * Initialize the nsDeviceContextSpecMac for use.  This will allocate a printrecord for use
+ * @update   dc 2/16/98
+ * @param aQuiet if PR_TRUE, prevent the need for user intervention
+ *        in obtaining device context spec. if nsnull is passed in for
+ *        the aOldSpec, this will typically result in getting a device
+ *        context spec for the default output device (i.e. default
+ *        printer).
+ * @return error status
+ */
+  NS_IMETHOD Init(PRBool	aQuiet);
+  
+  
+/**
+ * Closes the printmanager if it is open.
+ * @update   dc 2/13/98
+ * @update   syd 3/20/99
+ * @return error status
+ */
+
+  NS_IMETHOD ClosePrintManager();
+
+  NS_IMETHOD GetToPrinter( PRBool &aToPrinter ); 
+
+  NS_IMETHOD GetFirstPageFirst ( PRBool &aFpf );     
+
+  NS_IMETHOD GetGrayscale( PRBool &aGrayscale );   
+
+  NS_IMETHOD GetSize ( int &aSize ); 
+
+  NS_IMETHOD GetTopMargin ( float &value ); 
+
+  NS_IMETHOD GetBottomMargin ( float &value ); 
+
+  NS_IMETHOD GetLeftMargin ( float &value ); 
+
+  NS_IMETHOD GetRightMargin ( float &value ); 
+
+  NS_IMETHOD GetCommand ( char **aCommand );   
+
+  NS_IMETHOD GetPath ( char **aPath );    
+
+  NS_IMETHOD GetUserCancelled( PRBool &aCancel );      
+
+protected:
+/**
+ * Destuct a nsDeviceContextSpecMac, this will release the printrecord
+ * @update  dc 2/16/98
+ */
+  virtual ~nsDeviceContextSpecGTK();
+
+protected:
+
+  UnixPrData mPrData;
+	
+};
+
+#endif

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp

@@ -0,0 +1,367 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
+#define USE_SHM
+#endif
+
+//#define USE_SHM
+
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+#ifdef USE_SHM
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+#endif /* USE_SHM */
+#include "nsDrawingSurfaceGTK.h"
+
+static NS_DEFINE_IID(kIDrawingSurfaceIID, NS_IDRAWING_SURFACE_IID);
+static NS_DEFINE_IID(kIDrawingSurfaceGTKIID, NS_IDRAWING_SURFACE_GTK_IID);
+
+nsDrawingSurfaceGTK :: nsDrawingSurfaceGTK()
+{
+  NS_INIT_REFCNT();
+  GdkVisual *v;
+
+  mPixmap = nsnull;
+  mGC = nsnull;
+  mDepth = 0;
+  mWidth = mHeight = 0;
+  mFlags = 0;
+
+  mImage = nsnull;
+  mLockWidth = mLockHeight = 0;
+  mLockFlags = 0;
+  mLocked = PR_FALSE;
+
+  v = ::gdk_rgb_get_visual();
+
+  mPixFormat.mRedMask = v->red_mask;
+  mPixFormat.mGreenMask = v->green_mask;
+  mPixFormat.mBlueMask = v->blue_mask;
+  // FIXME
+  mPixFormat.mAlphaMask = 0;
+
+  mPixFormat.mRedShift = v->red_shift;
+  mPixFormat.mGreenShift = v->green_shift;
+  mPixFormat.mBlueShift = v->blue_shift;
+  // FIXME
+  mPixFormat.mAlphaShift = 0;
+
+  mDepth = v->depth;
+}
+
+nsDrawingSurfaceGTK :: ~nsDrawingSurfaceGTK()
+{
+  if (mPixmap)
+    ::gdk_pixmap_unref(mPixmap);
+
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDrawingSurfaceIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDrawingSurfaceGTKIID))
+  {
+    nsDrawingSurfaceGTK* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDrawingSurfaceGTK);
+NS_IMPL_RELEASE(nsDrawingSurfaceGTK);
+
+
+  /**
+   * Lock a rect of a drawing surface and return a
+   * pointer to the upper left hand corner of the
+   * bitmap.
+   * @param  aX x position of subrect of bitmap
+   * @param  aY y position of subrect of bitmap
+   * @param  aWidth width of subrect of bitmap
+   * @param  aHeight height of subrect of bitmap
+   * @param  aBits out parameter for upper left hand
+   *         corner of bitmap
+   * @param  aStride out parameter for number of bytes
+   *         to add to aBits to go from scanline to scanline
+   * @param  aWidthBytes out parameter for number of
+   *         bytes per line in aBits to process aWidth pixels
+   * @return error status
+   *
+   **/
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Lock(PRInt32 aX, PRInt32 aY,
+                                          PRUint32 aWidth, PRUint32 aHeight,
+                                          void **aBits, PRInt32 *aStride,
+                                          PRInt32 *aWidthBytes, PRUint32 aFlags)
+{
+#if 0
+  g_print("nsDrawingSurfaceGTK::Lock() called\n" \
+          "  aX = %i, aY = %i,\n" \
+	  "  aWidth = %i, aHeight = %i,\n" \
+	  "  aBits, aStride, aWidthBytes,\n" \
+	  "  aFlags = %i\n", aX, aY, aWidth, aHeight, aFlags);
+#endif
+
+  if (mLocked)
+  {
+    NS_ASSERTION(0, "nested lock attempt");
+    return NS_ERROR_FAILURE;
+  }
+  mLocked = PR_TRUE;
+
+  mLockX = aX;
+  mLockY = aY;
+  mLockWidth = aWidth;
+  mLockHeight = aHeight;
+  mLockFlags = aFlags;
+
+  // Obtain an ximage from the pixmap.
+#ifdef USE_SHM
+  if (gdk_get_use_xshm())
+  {
+    mImage = gdk_image_new(GDK_IMAGE_FASTEST,
+                           gdk_rgb_get_visual(),
+                           mLockWidth,
+                           mLockHeight);
+    
+    XShmGetImage(GDK_DISPLAY(),
+                 GDK_WINDOW_XWINDOW(mPixmap),
+                 GDK_IMAGE_XIMAGE(mImage),
+                 mLockX, mLockY,
+                 0xFFFFFFFF);
+
+    gdk_flush();
+  }
+  else
+  {
+#endif /* USE_SHM */
+    mImage = ::gdk_image_get(mPixmap, mLockX, mLockY, mLockWidth, mLockHeight);
+#ifdef USE_SHM
+  }
+#endif /* USE_SHM */
+
+  *aBits = GDK_IMAGE_XIMAGE(mImage)->data;
+
+  *aWidthBytes = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+  *aStride = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+
+#if 0
+  int bytes_per_line = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+  //
+  // All this code is a an attempt to set the stride width properly.
+  // Needs to be cleaned up alot.  For now, it will only work in the
+  // case where aWidthBytes and aStride are the same.  One is assigned to 
+  // the other.
+  // 
+
+  *aWidthBytes = mImage->bpl;
+  *aStride = mImage->bpl;
+
+  int width_in_pixels = *aWidthBytes << 8;
+
+
+  int bitmap_pad = GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+  int depth = GDK_IMAGE_XIMAGE(mImage)->depth;
+
+#define RASWIDTH8(width, bpp) (width)
+#define RASWIDTH16(width, bpp) ((((width) * (bpp) + 15) >> 4) << 1)
+#define RASWIDTH32(width, bpp) ((((width) * (bpp) + 31) >> 5) << 2)
+
+  switch(bitmap_pad)
+    {
+    case 8:
+      *aStride = RASWIDTH8(aWidth,bitmap_pad);
+      break;
+
+    case 16:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH16(aWidth,bitmap_pad);
+      break;
+
+    case 32:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH32(aWidth,bitmap_pad);
+      break;
+
+    default:
+
+      NS_ASSERTION(nsnull,"something got screwed");
+
+    }
+
+  *aStride = (*aWidthBytes) + ((bitmap_pad >> 3) - 1);
+
+  GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+
+  *aWidthBytes = mImage->bpl;
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Unlock(void)
+{
+  //  g_print("nsDrawingSurfaceGTK::UnLock() called\n");
+  if (!mLocked)
+  {
+    NS_ASSERTION(0, "attempting to unlock an DS that isn't locked");
+    return NS_ERROR_FAILURE;
+  }
+
+  // If the lock was not read only, put the bits back on the pixmap
+  if (!(mLockFlags & NS_LOCK_SURFACE_READ_ONLY))
+  {
+#if 0
+    g_print("gdk_draw_image(pixmap=%p,lockx=%d,locky=%d,lockw=%d,lockh=%d)\n",
+            mPixmap,
+            mLockX, mLockY,
+            mLockWidth, mLockHeight);
+#endif
+
+    gdk_draw_image(mPixmap,
+                   mGC,
+                   mImage,
+                   0, 0,
+                   mLockX, mLockY,
+                   mLockWidth, mLockHeight);
+
+  }
+
+  // FIXME if we are using shared mem, we shouldn't destroy the image...
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+  mImage = nsnull;
+
+  mLocked = PR_FALSE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight)
+{
+  *aWidth = mWidth;
+  *aHeight = mHeight;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsOffscreen(PRBool *aOffScreen)
+{
+  *aOffScreen = mIsOffscreen;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsPixelAddressable(PRBool *aAddressable)
+{
+// FIXME
+  *aAddressable = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetPixelFormat(nsPixelFormat *aFormat)
+{
+  *aFormat = mPixFormat;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkDrawable *aDrawable, GdkGC *aGC)
+{
+  mGC = aGC;
+  mPixmap = aDrawable;
+// this is definatly going to be on the screen, as it will be the window of a
+// widget or something.
+  mIsOffscreen = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkGC *aGC, PRUint32 aWidth,
+                                          PRUint32 aHeight, PRUint32 aFlags)
+{
+//  ::g_return_val_if_fail (aGC != nsnull, NS_ERROR_FAILURE);
+//  ::g_return_val_if_fail ((aWidth > 0) && (aHeight > 0), NS_ERROR_FAILURE);
+
+  mGC = aGC;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mFlags = aFlags;
+
+// we can draw on this offscreen because it has no parent
+  mIsOffscreen = PR_TRUE;
+
+  mPixmap = ::gdk_pixmap_new(nsnull, mWidth, mHeight, mDepth);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetGC(GdkGC *aGC)
+{
+  aGC = ::gdk_gc_ref(mGC);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: ReleaseGC(void)
+{
+  ::gdk_gc_unref(mGC);
+  return NS_OK;
+}
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+GdkGC *nsDrawingSurfaceGTK::GetGC(void)
+{
+  return mGC;
+}
+
+GdkDrawable *nsDrawingSurfaceGTK::GetDrawable(void)
+{
+  return mPixmap;
+}
+

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.h

@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsDrawingSurfaceGTK_h___
+#define nsDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include "nsIDrawingSurfaceGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsDrawingSurfaceGTK : public nsIDrawingSurface,
+                            public nsIDrawingSurfaceGTK
+{
+public:
+  nsDrawingSurfaceGTK();
+  virtual ~nsDrawingSurfaceGTK();
+
+  NS_DECL_ISUPPORTS
+
+  //nsIDrawingSurface interface
+
+  NS_IMETHOD Lock(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                  void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                  PRUint32 aFlags);
+  NS_IMETHOD Unlock(void);
+  NS_IMETHOD GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight);
+  NS_IMETHOD IsOffscreen(PRBool *aOffScreen);
+  NS_IMETHOD IsPixelAddressable(PRBool *aAddressable);
+  NS_IMETHOD GetPixelFormat(nsPixelFormat *aFormat);
+
+  //nsIDrawingSurfaceGTK interface
+
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC);
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight, PRUint32 aFlags);
+
+/* get the GC and manage the GdkGC's refcount */
+  NS_IMETHOD GetGC(GdkGC *aGC);
+  NS_IMETHOD ReleaseGC(void);
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+  GdkGC *GetGC(void);
+  GdkDrawable *GetDrawable(void);
+
+private:
+  /* general */
+  GdkPixmap	*mPixmap;
+  GdkGC		*mGC;
+  gint		mDepth;
+  nsPixelFormat	mPixFormat;
+  PRUint32      mWidth;
+  PRUint32      mHeight;
+  PRUint32	mFlags;
+  PRBool	mIsOffscreen;
+
+  /* for locks */
+  GdkImage	*mImage;
+  PRInt32	mLockX;
+  PRInt32	mLockY;
+  PRUint32	mLockWidth;
+  PRUint32	mLockHeight;
+  PRUint32	mLockFlags;
+  PRBool	mLocked;
+};
+
+#endif

mozilla/gfx/src/gtk/nsFontMetricsGTK.h

@@ -0,0 +1,162 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsFontMetricsGTK_h__
+#define nsFontMetricsGTK_h__
+
+#include "nsIFontMetrics.h"
+#include "nsFont.h"
+#include "nsString.h"
+#include "nsUnitConversion.h"
+#include "nsIDeviceContext.h"
+#include "nsCRT.h"
+#include "nsDeviceContextGTK.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define FONT_SWITCHING
+#ifdef FONT_SWITCHING
+
+#ifdef ADD_GLYPH
+#undef ADD_GLYPH
+#endif
+#define ADD_GLYPH(map, g) (map)[(g) >> 3] |= (1 << ((g) & 7))
+
+#ifdef FONT_HAS_GLYPH
+#undef FONT_HAS_GLYPH
+#endif
+#define FONT_HAS_GLYPH(map, g) (((map)[(g) >> 3] >> ((g) & 7)) & 1)
+
+typedef struct nsFontCharSetInfo nsFontCharSetInfo;
+
+typedef gint (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
+  const PRUnichar* aSrcBuf, PRUint32 aSrcLen, PRUint8* aDestBuf,
+  PRUint32 aDestLen);
+
+struct nsFontCharSet;
+class nsFontMetricsGTK;
+
+struct nsFontGTK
+{
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  void LoadFont(nsFontCharSet* aCharSet, nsFontMetricsGTK* aMetrics);
+
+  GdkFont*               mFont;
+  PRUint8*               mMap;
+  nsFontCharSetInfo*     mCharSetInfo;
+  char*                  mName;
+  PRUint16               mSize;
+  PRUint16               mActualSize;
+  PRInt16                mBaselineAdjust;
+};
+
+struct nsFontStretch;
+struct nsFontFamily;
+typedef struct nsFontSearch nsFontSearch;
+
+#endif /* FONT_SWITCHING */
+
+class nsFontMetricsGTK : public nsIFontMetrics
+{
+public:
+  nsFontMetricsGTK();
+  virtual ~nsFontMetricsGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(const nsFont& aFont, nsIDeviceContext* aContext);
+  NS_IMETHOD  Destroy();
+
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize);
+  NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize);
+
+  NS_IMETHOD  GetHeight(nscoord &aHeight);
+  NS_IMETHOD  GetLeading(nscoord &aLeading);
+  NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
+  NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
+  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
+  NS_IMETHOD  GetFont(const nsFont *&aFont);
+  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
+
+#ifdef FONT_SWITCHING
+
+  nsFontGTK*  FindFont(PRUnichar aChar);
+  static gint GetWidth(nsFontGTK* aFont, const PRUnichar* aString,
+                       PRUint32 aLength);
+  static void DrawString(nsDrawingSurfaceGTK* aSurface, nsFontGTK* aFont,
+                         nscoord aX, nscoord aY, const PRUnichar* aString,
+			 PRUint32 aLength);
+  static void InitFonts(void);
+
+  friend void PickASizeAndLoad(nsFontSearch* aSearch, nsFontStretch* aStretch,
+                               nsFontCharSet* aCharSet);
+  friend void TryCharSet(nsFontSearch* aSearch, nsFontCharSet* aCharSet);
+  friend void TryFamily(nsFontSearch* aSearch, nsFontFamily* aFamily);
+  friend struct nsFontGTK;
+
+  nsFontGTK   **mLoadedFonts;
+  PRUint16    mLoadedFontsAlloc;
+  PRUint16    mLoadedFontsCount;
+
+  nsString    *mFonts;
+  PRUint16    mFontsAlloc;
+  PRUint16    mFontsCount;
+  PRUint16    mFontsIndex;
+
+#endif /* FONT_SWITCHING */
+
+protected:
+  char *PickAppropriateSize(char **names, XFontStruct *fonts, int cnt, nscoord desired);
+  void RealizeFont();
+
+  nsIDeviceContext    *mDeviceContext;
+  nsFont              *mFont;
+  GdkFont             *mFontHandle;
+
+  nscoord             mHeight;
+  nscoord             mAscent;
+  nscoord             mDescent;
+  nscoord             mLeading;
+  nscoord             mMaxAscent;
+  nscoord             mMaxDescent;
+  nscoord             mMaxAdvance;
+  nscoord             mXHeight;
+  nscoord             mSuperscriptOffset;
+  nscoord             mSubscriptOffset;
+  nscoord             mStrikeoutSize;
+  nscoord             mStrikeoutOffset;
+  nscoord             mUnderlineSize;
+  nscoord             mUnderlineOffset;
+
+#ifdef FONT_SWITCHING
+
+  PRUint16            mPixelSize;
+  PRUint8             mStretchIndex;
+  PRUint8             mStyleIndex;
+
+#endif /* FONT_SWITCHING */
+};
+
+#endif

mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp

@@ -0,0 +1,205 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#include <gtk/gtk.h>
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsGfxCIID.h"
+#include "nsFontMetricsGTK.h"
+#include "nsRenderingContextGTK.h"
+#include "nsImageGTK.h"
+#include "nsDeviceContextGTK.h"
+#include "nsRegionGTK.h"
+#include "nsBlender.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsDeviceContextSpecFactoryG.h" 
+#include "nsIDeviceContextSpecPS.h"
+
+static NS_DEFINE_IID(kCFontMetrics, NS_FONT_METRICS_CID);
+static NS_DEFINE_IID(kCRenderingContext, NS_RENDERING_CONTEXT_CID);
+static NS_DEFINE_IID(kCImage, NS_IMAGE_CID);
+static NS_DEFINE_IID(kCDeviceContext, NS_DEVICE_CONTEXT_CID);
+static NS_DEFINE_IID(kCRegion, NS_REGION_CID);
+
+static NS_DEFINE_IID(kCBlender, NS_BLENDER_CID);
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
+
+static NS_DEFINE_IID(kCDeviceContextSpec, NS_DEVICE_CONTEXT_SPEC_CID);
+static NS_DEFINE_IID(kCDeviceContextSpecFactory, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); 
+
+
+class nsGfxFactoryGTK : public nsIFactory
+{   
+  public:   
+    // nsISupports methods   
+    NS_IMETHOD QueryInterface(const nsIID &aIID,    
+                                       void **aResult);   
+    NS_IMETHOD_(nsrefcnt) AddRef(void);   
+    NS_IMETHOD_(nsrefcnt) Release(void);   
+
+    // nsIFactory methods   
+    NS_IMETHOD CreateInstance(nsISupports *aOuter,   
+                                       const nsIID &aIID,   
+                                       void **aResult);   
+
+    NS_IMETHOD LockFactory(PRBool aLock);   
+
+    nsGfxFactoryGTK(const nsCID &aClass);   
+    virtual ~nsGfxFactoryGTK();   
+
+  private:   
+    nsrefcnt  mRefCnt;   
+    nsCID     mClassID;
+};   
+
+nsGfxFactoryGTK::nsGfxFactoryGTK(const nsCID &aClass)   
+{   
+  mRefCnt = 0;
+  mClassID = aClass;
+}   
+
+nsGfxFactoryGTK::~nsGfxFactoryGTK()   
+{   
+  NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");   
+}   
+
+nsresult nsGfxFactoryGTK::QueryInterface(const nsIID &aIID,   
+                                         void **aResult)   
+{   
+  if (aResult == NULL) {   
+    return NS_ERROR_NULL_POINTER;   
+  }   
+
+  // Always NULL result, in case of failure   
+  *aResult = NULL;   
+
+  if (aIID.Equals(kISupportsIID)) {   
+    *aResult = (void *)(nsISupports*)this;   
+  } else if (aIID.Equals(kIFactoryIID)) {   
+    *aResult = (void *)(nsIFactory*)this;   
+  }   
+
+  if (*aResult == NULL) {   
+    return NS_NOINTERFACE;   
+  }   
+
+  AddRef(); // Increase reference count for caller   
+  return NS_OK;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::AddRef()   
+{   
+  return ++mRefCnt;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::Release()   
+{   
+  if (--mRefCnt == 0) {   
+    delete this;   
+    return 0; // Don't access mRefCnt after deleting!   
+  }   
+  return mRefCnt;   
+}  
+
+nsresult nsGfxFactoryGTK::CreateInstance(nsISupports *aOuter,  
+                                          const nsIID &aIID,  
+                                          void **aResult)  
+{  
+  if (aResult == NULL) {  
+    return NS_ERROR_NULL_POINTER;  
+  }  
+
+  *aResult = NULL;  
+  
+  nsISupports *inst = nsnull;
+
+  if (mClassID.Equals(kCFontMetrics)) {
+    inst = (nsISupports *)new nsFontMetricsGTK();
+  }
+  else if (mClassID.Equals(kCDeviceContext)) {
+    inst = (nsISupports *)new nsDeviceContextGTK();
+  }
+  else if (mClassID.Equals(kCRenderingContext)) {
+    inst = (nsISupports *)new nsRenderingContextGTK();
+  }
+  else if (mClassID.Equals(kCImage)) {
+    inst = (nsISupports *)new nsImageGTK();
+  }
+  else if (mClassID.Equals(kCRegion)) {
+    inst = (nsISupports *)new nsRegionGTK();
+  }
+  else if (mClassID.Equals(kCBlender)) {
+    inst = (nsISupports *)new nsBlender;
+  }
+  else if (mClassID.Equals(kCDeviceContextSpec)) {
+    nsDeviceContextSpecGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecGTK);
+    inst = (nsISupports *)((nsIDeviceContextSpecPS *)dcs);
+  }
+  else if (mClassID.Equals(kCDeviceContextSpecFactory)) {
+    nsDeviceContextSpecFactoryGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecFactoryGTK);
+    inst = (nsISupports *)dcs;
+  }          
+	
+  if (inst == NULL) {  
+    return NS_ERROR_OUT_OF_MEMORY;  
+  }  
+
+  nsresult res = inst->QueryInterface(aIID, aResult);
+
+  if (res != NS_OK) {  
+    // We didn't get the right interface, so clean up  
+    delete inst;  
+  }  
+//  else {
+//    inst->Release();
+//  }
+
+  return res;  
+}  
+
+nsresult nsGfxFactoryGTK::LockFactory(PRBool aLock)  
+{  
+  // Not implemented in simplest case.  
+  return NS_OK;
+}  
+
+// return the proper factory to the caller
+extern "C" NS_GFXNONXP nsresult NSGetFactory(nsISupports* servMgr,
+                                             const nsCID &aClass,
+                                             const char *aClassName,
+                                             const char *aProgID,
+                                             nsIFactory **aFactory)
+{
+  if (nsnull == aFactory) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  *aFactory = new nsGfxFactoryGTK(aClass);
+
+  if (nsnull == aFactory) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
+}

mozilla/gfx/src/gtk/nsIDrawingSurfaceGTK.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsIDrawingSurfaceGTK_h___
+#define nsIDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include <gtk/gtk.h>
+
+// windows specific drawing surface method set
+
+#define NS_IDRAWING_SURFACE_GTK_IID   \
+{ 0x1ed958b0, 0xcab6, 0x11d2, \
+{ 0xa8, 0x49, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
+
+class nsIDrawingSurfaceGTK : public nsISupports
+{
+public:
+  /**
+   * Initialize a drawing surface using a windows DC.
+   * aDC is "owned" by the drawing surface until the drawing
+   * surface is destroyed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC) = 0;
+
+  /**
+   * Initialize an offscreen drawing surface using a
+   * windows DC. aDC is not "owned" by this drawing surface, instead
+   * it is used to create a drawing surface compatible
+   * with aDC. if width or height are less than zero, aDC will
+   * be created with no offscreen bitmap installed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @param  aWidth width of drawing surface
+   * @param  aHeight height of drawing surface
+   * @param  aFlags flags used to control type of drawing
+   *         surface created
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight,
+                  PRUint32 aFlags) = 0;
+
+  /**
+   * Get a windows DC that represents the drawing surface.
+   * GetDC() must be paired with ReleaseDC(). Getting a DC
+   * and Lock()ing are mutually exclusive operations.
+   * @param  aDC out parameter for HDC
+   * @return error status
+   **/
+  NS_IMETHOD GetGC(GdkGC *aGC) = 0;
+
+  /**
+   * Release a windows DC obtained by GetDC().
+   * ReleaseDC() must be preceded by a call to ReleaseDC().
+   * @return error status
+   **/
+  NS_IMETHOD ReleaseGC(void) = 0;
+
+};
+
+#endif  // nsIDrawingSurfaceGTK_h___ 

mozilla/gfx/src/gtk/nsImageGTK.cpp

@@ -0,0 +1,515 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include "nsImageGTK.h"
+#include "nsRenderingContextGTK.h"
+
+#include "nspr.h"
+
+#define IsFlagSet(a,b) (a & b)
+
+#undef CHEAP_PERFORMANCE_MEASURMENT
+
+
+// Defining this will trace the allocation of images.  This includes
+// ctor, dtor and update.
+#undef TRACE_IMAGE_ALLOCATION
+
+static NS_DEFINE_IID(kIImageIID, NS_IIMAGE_IID);
+
+//------------------------------------------------------------
+
+nsImageGTK::nsImageGTK()
+{
+  NS_INIT_REFCNT();
+  mImageBits = nsnull;
+  mWidth = 0;
+  mHeight = 0;
+  mDepth = 0;
+  mAlphaBits = nsnull;
+  mAlphaPixmap = nsnull;
+  mImagePixmap = nsnull;
+  mGC = nsnull;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+//------------------------------------------------------------
+
+nsImageGTK::~nsImageGTK()
+{
+  if(nsnull != mImageBits) {
+    delete[] (PRUint8*)mImageBits;
+    mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (nsnull != mGC) {
+    gdk_gc_unref(mGC);
+    mGC = nsnull;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::~nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+NS_IMPL_ISUPPORTS(nsImageGTK, kIImageIID);
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Init(PRInt32 aWidth, PRInt32 aHeight,
+                          PRInt32 aDepth, nsMaskRequirements aMaskRequirements)
+{
+  g_return_val_if_fail ((aWidth != 0) || (aHeight != 0), NS_ERROR_FAILURE);
+
+  if (nsnull != mImageBits) {
+   delete[] (PRUint8*)mImageBits;
+   mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (24 == aDepth) {
+    mNumBytesPixel = 3;
+  } else {
+    NS_ASSERTION(PR_FALSE, "unexpected image depth");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  mImageUpdated = PR_TRUE;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mDepth = aDepth;
+  mIsTopToBottom = PR_TRUE;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Init(this=%p,%d,%d,%d,%d)\n",
+         this,
+         aWidth,
+         aHeight,
+         aDepth,
+         aMaskRequirements);
+#endif
+
+  // create the memory for the image
+  ComputMetrics();
+
+  mImageBits = (PRUint8*) new PRUint8[mSizeImage];
+
+  switch(aMaskRequirements)
+  {
+    case nsMaskRequirements_kNoMask:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      break;
+
+    case nsMaskRequirements_kNeeds1Bit:
+      mAlphaRowBytes = (aWidth + 7) / 8;
+      mAlphaDepth = 1;
+
+      // 32-bit align each row
+      mAlphaRowBytes = (mAlphaRowBytes + 3) & ~0x3;
+
+      mAlphaBits = new PRUint8[mAlphaRowBytes * aHeight];
+      mAlphaWidth = aWidth;
+      mAlphaHeight = aHeight;
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+
+    case nsMaskRequirements_kNeeds8Bit:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      mAlphaDepth = 8;
+      g_print("TODO: want an 8bit mask for an image..\n");
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+  }
+
+
+  mImagePixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                gdk_rgb_get_visual()->depth);
+  mGC = gdk_gc_new(mImagePixmap);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+PRInt32 nsImageGTK::CalcBytesSpan(PRUint32  aWidth)
+{
+  PRInt32 spanbytes;
+
+  spanbytes = (aWidth * mDepth) >> 5;
+
+  if (((PRUint32)aWidth * mDepth) & 0x1F)
+    spanbytes++;
+  spanbytes <<= 2;
+  return(spanbytes);
+}
+
+void nsImageGTK::ComputMetrics()
+{
+  mRowBytes = CalcBytesSpan(mWidth);
+  mSizeImage = mRowBytes * mHeight;
+}
+
+PRInt32 nsImageGTK::GetHeight()
+{
+  return mHeight;
+}
+
+PRInt32 nsImageGTK::GetWidth()
+{
+  return mWidth;
+}
+
+PRUint8 *nsImageGTK::GetBits()
+{
+  return mImageBits;
+}
+
+void *nsImageGTK::GetBitInfo()
+{
+  return nsnull;
+}
+
+PRInt32 nsImageGTK::GetLineStride()
+{
+  return mRowBytes;
+}
+
+nsColorMap *nsImageGTK::GetColorMap()
+{
+  return nsnull;
+}
+
+PRBool nsImageGTK::IsOptimized()
+{
+  return PR_TRUE;
+}
+
+PRUint8 *nsImageGTK::GetAlphaBits()
+{
+  return mAlphaBits;
+}
+
+PRInt32 nsImageGTK::GetAlphaWidth()
+{
+  return mAlphaWidth;
+}
+
+PRInt32 nsImageGTK::GetAlphaHeight()
+{
+  return mAlphaHeight;
+}
+
+PRInt32 nsImageGTK::GetAlphaLineStride()
+{
+  return mAlphaRowBytes;
+}
+
+nsIImage *nsImageGTK::DuplicateImage()
+{
+  return nsnull;
+}
+
+void nsImageGTK::SetAlphaLevel(PRInt32 aAlphaLevel)
+{
+}
+
+PRInt32 nsImageGTK::GetAlphaLevel()
+{
+  return 0;
+}
+
+void nsImageGTK::MoveAlphaMask(PRInt32 aX, PRInt32 aY)
+{
+}
+
+//------------------------------------------------------------
+
+// set up the palette to the passed in color array, RGB only in this array
+void nsImageGTK::ImageUpdated(nsIDeviceContext *aContext,
+                              PRUint8 aFlags,
+                              nsRect *aUpdateRect)
+{
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::ImageUpdated(this=%p,%d)\n",
+         this,
+         aFlags);
+#endif
+
+  if (IsFlagSet(nsImageUpdateFlags_kBitsChanged, aFlags)) {
+    mImageUpdated = PR_TRUE;
+    // FIXME do something with aUpdateRect
+  }
+}
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+static PRTime gConvertTime, gStartTime, gPixmapTime, gEndTime;
+#endif
+
+// Draw the bitmap, this method has a source and destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
+                 PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                 PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+  nsDrawingSurfaceGTK *drawing = (nsDrawingSurfaceGTK*)aSurface;
+
+  if (mAlphaBits)
+    g_print("calling nsImageGTK::Draw() with alpha bits\n");
+
+  gdk_draw_rgb_image (drawing->GetDrawable(),
+                      mGC,
+                      aDX, aDY, aDWidth, aDHeight,
+                      GDK_RGB_DITHER_MAX,
+                      mImageBits + mRowBytes * aSY + 3 * aDX,
+                      mRowBytes);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+// Draw the bitmap, this draw just has destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext,
+                 nsDrawingSurface aSurface,
+                 PRInt32 aX, PRInt32 aY,
+                 PRInt32 aWidth, PRInt32 aHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+
+  // XXX kipp: this is temporary code until we eliminate the
+  // width/height arguments from the draw method.
+  if ((aWidth != mWidth) || (aHeight != mHeight)) {
+    aWidth = mWidth;
+    aHeight = mHeight;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Draw(this=%p,x=%d,y=%d,width=%d,height=%d)\n",
+         this,
+         aX,
+         aY,
+         aWidth,
+         aHeight);
+#endif
+
+  nsDrawingSurfaceGTK* drawing = (nsDrawingSurfaceGTK*) aSurface;
+
+  XImage *x_image = nsnull;
+  Pixmap pixmap = 0;
+  Display *dpy = nsnull;
+  Visual *visual = nsnull;
+  GC      gc;
+  XGCValues gcv;
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gStartTime = gPixmapTime = PR_Now();
+#endif
+
+  // Create gc clip-mask on demand
+  if ((mAlphaBits) && (mImageUpdated == PR_TRUE))
+  {
+    /* get the X primitives */
+    dpy = GDK_WINDOW_XDISPLAY(mAlphaPixmap);
+
+    
+    /* this is the depth of the pixmap that we are going to draw to.
+       It's always a bitmap.  We're doing alpha here folks. */
+    visual = GDK_VISUAL_XVISUAL(gdk_rgb_get_visual());
+
+    // Make an image out of the alpha-bits created by the image library
+    x_image = XCreateImage(dpy, visual,
+                           1, /* visual depth...1 for bitmaps */
+                           XYPixmap,
+                           0, /* x offset, XXX fix this */
+                           (char *)mAlphaBits,  /* cast away our sign. */
+                           aWidth,
+                           aHeight,
+                           32,/* bitmap pad */
+                           mAlphaRowBytes); /* bytes per line */
+
+    x_image->bits_per_pixel=1;
+
+    /* Image library always places pixels left-to-right MSB to LSB */
+    x_image->bitmap_bit_order = MSBFirst;
+
+    /* This definition doesn't depend on client byte ordering
+       because the image library ensures that the bytes in
+       bitmask data are arranged left to right on the screen,
+       low to high address in memory. */
+    x_image->byte_order = MSBFirst;
+#if defined(IS_LITTLE_ENDIAN)
+    // no, it's still MSB XXX check on this!!
+    //      x_image->byte_order = LSBFirst;
+#elif defined (IS_BIG_ENDIAN)
+    x_image->byte_order = MSBFirst;
+#else
+#error ERROR! Endianness is unknown;
+#endif
+
+    // Write into the pixemap that is underneath gdk's mAlphaPixmap
+    // the image we just created.
+
+    pixmap = GDK_WINDOW_XWINDOW(mAlphaPixmap);
+    memset(&gcv, 0, sizeof(XGCValues));
+    gcv.function = GXcopy;
+    gc = XCreateGC(dpy, pixmap, GCFunction, &gcv);
+    XPutImage(dpy, pixmap, gc, x_image, 0, 0, 0, 0,
+              aWidth, aHeight);
+    XFreeGC(dpy, gc);
+
+    // Now we are done with the temporary image
+    x_image->data = 0;          /* Don't free the IL_Pixmap's bits. */
+    XDestroyImage(x_image);
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+    gPixmapTime = PR_Now();
+#endif
+  }
+
+  // Render unique image bits onto an off screen pixmap only once
+  // The image bits can change as a result of ImageUpdated() - for
+  // example: animated GIFs.
+  if (mImageUpdated == PR_TRUE)
+  {
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_pixmap_new(nsnull,width=%d,height=%d,depth=%d)\n",
+           this,
+           aWidth,
+           aHeight,
+           mDepth);
+#endif
+
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+
+    // Render the image bits into an off screen pixmap
+    gdk_draw_rgb_image (mImagePixmap,
+                        mGC,
+                        0, 0, aWidth, aHeight,
+                        GDK_RGB_DITHER_MAX,
+                        mImageBits, mRowBytes);
+
+    if (mAlphaPixmap)
+    {
+      // Setup gc to use the given alpha-pixmap for clipping
+      gdk_gc_set_clip_mask(mGC, mAlphaPixmap);
+      gdk_gc_set_clip_origin(mGC, aX, aY);
+    }
+    
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_draw_pixmap(x=%d,y=%d,width=%d,height=%d)\n",
+           this,
+           aX,
+           aY,
+           aWidth,
+           aHeight);
+#endif
+
+    mImageUpdated = PR_FALSE;
+  }
+
+
+  // copy our offscreen pixmap onto the window.
+  gdk_window_copy_area(drawing->GetDrawable(),      // dest window
+                       mGC,                         // gc
+                       aX,                          // xsrc
+                       aY,                          // ysrc
+                       mImagePixmap,                // source window
+                       0,                           // xdest
+                       0,                           // ydest
+                       aWidth,                      // width
+                       aHeight);                    // height
+
+  if (mAlphaBits)
+  {
+    // Revert gc to its old clip-mask and origin
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+  }
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gEndTime = PR_Now();
+  printf("nsImageGTK::Draw(this=%p,w=%d,h=%d) total=%lld pixmap=%lld, cvt=%lld\n",
+         this,
+         aWidth, aHeight,
+         gEndTime - gStartTime,
+         gPixmapTime - gStartTime,
+         gConvertTime - gPixmapTime);
+#endif
+
+  mImageUpdated = PR_FALSE;
+
+  return NS_OK;
+}
+
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Optimize(nsIDeviceContext* aContext)
+{
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsImageGTK.h

@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsImageGTK_h___
+#define nsImageGTK_h___
+
+#include "nsIImage.h"
+
+#include "X11/Xlib.h"
+#include "X11/Xutil.h"
+#include <gdk/gdk.h>
+
+#undef Bool
+
+class nsImageGTK : public nsIImage
+{
+public:
+  nsImageGTK();
+  virtual ~nsImageGTK();
+
+  NS_DECL_ISUPPORTS
+
+  /**
+  @see nsIImage.h
+  */
+  virtual PRInt32     GetBytesPix()       { return mNumBytesPixel; }
+  virtual PRInt32     GetHeight();
+  virtual PRInt32     GetWidth();
+  virtual PRUint8*    GetBits();
+  virtual void*       GetBitInfo();
+  virtual PRBool      GetIsRowOrderTopToBottom() { return mIsTopToBottom; }
+  virtual PRInt32     GetLineStride();
+  virtual nsColorMap* GetColorMap();
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aX, PRInt32 aY,
+                  PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                  PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight);
+  virtual void ImageUpdated(nsIDeviceContext *aContext,
+                            PRUint8 aFlags, nsRect *aUpdateRect);
+  virtual nsresult    Init(PRInt32 aWidth, PRInt32 aHeight,
+                           PRInt32 aDepth,
+                           nsMaskRequirements aMaskRequirements);
+  virtual PRBool      IsOptimized();
+
+  virtual nsresult    Optimize(nsIDeviceContext* aContext);
+  virtual PRUint8*    GetAlphaBits();
+  virtual PRInt32     GetAlphaWidth();
+  virtual PRInt32     GetAlphaHeight();
+  virtual PRInt32     GetAlphaLineStride();
+  virtual nsIImage*   DuplicateImage();
+
+  /**
+   * Calculate the number of bytes spaned for this image for a given width
+   * @param aWidth is the width to calculate the number of bytes for
+   * @return the number of bytes in this span
+   */
+  PRInt32  CalcBytesSpan(PRUint32  aWidth);
+  virtual void  SetAlphaLevel(PRInt32 aAlphaLevel);
+  virtual PRInt32 GetAlphaLevel();
+  virtual void  MoveAlphaMask(PRInt32 aX, PRInt32 aY);
+
+private:
+  /**
+   * Calculate the amount of memory needed for the initialization of the image
+   */
+  void ComputMetrics();
+  void ComputePaletteSize(PRIntn nBitCount);
+
+private:
+  PRInt32    mWidth;
+  PRInt32    mHeight;
+  PRInt32    mDepth;       // bits per pixel
+  PRInt32    mRowBytes;
+  PRUint8    *mImageBits;
+  PRUint8    *mConvertedBits;
+  PRInt32    mSizeImage;
+  PRBool     mIsTopToBottom;
+  PRBool     mImageUpdated;
+
+  PRInt8     mNumBytesPixel;
+
+  // alpha layer members
+  PRUint8    *mAlphaBits;
+  GdkPixmap  *mAlphaPixmap;
+  PRInt8     mAlphaDepth;        // alpha layer depth
+  PRInt16    mAlphaRowBytes;     // alpha bytes per row
+  PRInt16    mAlphaWidth;        // alpha layer width
+  PRInt16    mAlphaHeight;       // alpha layer height
+  nsPoint    mLocation;          // alpha mask location
+
+  GdkPixmap  *mImagePixmap;
+
+  GdkGC      *mGC;
+};
+
+#endif

mozilla/gfx/src/gtk/nsPrintdGTK.c

@@ -0,0 +1,452 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * 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.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#include <gtk/gtk.h>
+
+#include "nspr.h"
+
+#include "nsPrintdGTK.h"
+
+/* A structure to hold widgets that need to be referenced in callbacks. We
+   declare this statically in the caller entry point (as a field of 
+   UnixPrOps, below), and pass a pointer to the structure to Gtk+ for each 
+   signal handler registered. This avoids use of globals. */
+
+typedef struct prwidgets {
+	GtkWidget *toplevel;		/* should be set to toplevel window */
+	GtkWidget *prDialog;		
+	GtkWidget *cmdEntry;
+	GtkWidget *pathEntry;
+	GtkWidget *browseButton;
+	GtkWidget *fpfToggle;
+	GtkWidget *greyToggle;
+	GtkWidget *letterToggle;
+	GtkWidget *legalToggle;
+	GtkWidget *execToggle;
+	GtkWidget *topSpinner;
+	GtkWidget *bottomSpinner;
+	GtkWidget *leftSpinner;
+	GtkWidget *rightSpinner;
+	GtkFileSelection *fsWidget;
+} PrWidgets;
+
+typedef struct unixprops {
+	UnixPrData *prData;	/* pointer to caller struct */
+	PrWidgets widgets;	 
+} UnixPrOps;
+
+/* user clicked cancel. tear things down, and set cancel field in 
+   caller data to PR_TRUE so printing will not happen */
+
+static void
+CancelPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_TRUE;
+}
+
+/* user selected the Print button. Collect any remaining data from the
+   widgets, and set cancel field in caller data to PR_FALSE so printing
+   will be performed. Also, tear down dialog and exit inner main loop */
+ 
+static void
+DoPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->command, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.cmdEntry ) ) );
+	strcpy( prOps->prData->path, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.pathEntry ) ) );
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.fpfToggle )->active == PR_TRUE )
+		prOps->prData->fpf = PR_TRUE;
+	else
+		prOps->prData->fpf = PR_FALSE;
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.greyToggle )->active == PR_TRUE )
+		prOps->prData->grayscale = PR_TRUE;
+	else
+		prOps->prData->grayscale = PR_FALSE;
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.letterToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LETTER_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.legalToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LEGAL_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.execToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_EXECUTIVE_SIZE;
+	else
+		prOps->prData->size = NS_A4_SIZE;
+
+	/* margins */
+
+	prOps->prData->top = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.topSpinner) );
+	prOps->prData->bottom = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.bottomSpinner) );
+	prOps->prData->left = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.leftSpinner) );
+	prOps->prData->right = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.rightSpinner) );
+
+	/* we got everything... bring down the dialog and tell caller
+	   it's o.k. to print */
+
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_FALSE;
+}
+
+/* User hit ok in file selection widget brought up by the browse button.
+   snarf the selected file, stuff it in caller data */
+
+static void
+ModifyPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->path, 
+		gtk_file_selection_get_filename(prOps->widgets.fsWidget) );
+      	gtk_entry_set_text (GTK_ENTRY (prOps->widgets.pathEntry), 
+		prOps->prData->path);
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.fsWidget) );
+}
+
+/* user selected print to printer. de-sensitize print to file fields */
+
+static void
+SwitchToPrinter (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_FALSE );
+	prOps->prData->toPrinter = PR_TRUE;
+}
+
+/* user selected print to file. de-sensitize print to printer fields */
+
+static void
+SwitchToFile (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_TRUE );
+	prOps->prData->toPrinter = PR_FALSE;
+}
+
+/* user hit the browse button. Pop up a file selection widget and grab
+   result */
+
+static void
+GetPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+    GtkWidget *fs;
+
+    fs = gtk_file_selection_new("Netscape: File Browser");
+
+    gtk_file_selection_set_filename( GTK_FILE_SELECTION(fs), 
+	prOps->prData->path );
+
+    gtk_window_set_modal (GTK_WINDOW(fs),PR_TRUE);
+
+#if 0
+    /* XXX not sure what the toplevel window should be. */
+
+    gtk_window_set_transient_for (GTK_WINDOW (fs), 
+	GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+
+    prOps->widgets.fsWidget = GTK_FILE_SELECTION(fs);
+
+    gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button), 
+	"clicked", GTK_SIGNAL_FUNC(ModifyPrPath), prOps);
+
+    gtk_signal_connect_object (GTK_OBJECT(
+	GTK_FILE_SELECTION(fs)->cancel_button), "clicked",
+	GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (fs));
+
+    gtk_widget_show(fs);
+}
+
+/* create file data dialog. XXX widget should be NULL */
+
+static void
+DoPrintGTK (GtkWidget *widget, UnixPrOps *prOps)
+{
+	GtkWidget *separator, *dialog, *label, *vbox, *entry, *hbox, 
+		*button, *fileButton, *prButton, *table, *spinner1;
+        GtkAdjustment *adj;
+
+	prOps->widgets.prDialog = dialog = 
+		gtk_window_new( GTK_WINDOW_TOPLEVEL );
+	gtk_window_set_modal( GTK_WINDOW(dialog), PR_TRUE );
+#if 0
+	/* not yet sure what the toplevel window should be */
+
+        gtk_window_set_transient_for (GTK_WINDOW (dialog), 
+		GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+      	gtk_window_set_title( GTK_WINDOW(dialog), "Netscape: Print" );
+
+	vbox = gtk_vbox_new (PR_FALSE, 0);
+        gtk_container_add (GTK_CONTAINER (dialog), vbox);
+
+	table = gtk_table_new (3, 3, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+        gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_TRUE, 5);
+	label = gtk_label_new( "Print To:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = prButton = gtk_radio_button_new_with_label (NULL, "Printer");
+        if ( prOps->prData->toPrinter == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = fileButton = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), "File");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+        if ( prOps->prData->toPrinter == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+
+	label = gtk_label_new( "Print Command:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->command);
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 3, 1, 2,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	if ( prOps->prData->toPrinter == PR_FALSE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.cmdEntry = entry;
+
+	label = gtk_label_new( "File Name:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->path);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.pathEntry = entry;
+
+	button = gtk_button_new_with_label ("Browse...");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (GetPrPath), prOps);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.browseButton = button;
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	table = gtk_table_new (2, 4, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "First Page First");
+        if ( prOps->prData->fpf == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	prOps->widgets.fpfToggle = button;
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Last Page First");
+        if ( prOps->prData->fpf == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "Greyscale");
+	prOps->widgets.greyToggle = button;
+        if ( prOps->prData->grayscale == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Color");
+        if ( prOps->prData->grayscale == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Paper Size: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, 
+		"Letter (8 1/2 x 11 in.)");
+	prOps->widgets.letterToggle = button;
+        if ( prOps->prData->size == NS_LETTER_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Legal (8 1/2 x 14 in.)");
+	prOps->widgets.legalToggle = button;
+        if ( prOps->prData->size == NS_LEGAL_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Executive (7 1/2 x 10 in.)");
+	prOps->widgets.execToggle = button;
+        if ( prOps->prData->size == NS_EXECUTIVE_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"A4 (210 x 297 mm)");
+        if ( prOps->prData->size == NS_A4_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	/* margins */
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+      	gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_FALSE, PR_FALSE, 5);
+	label = gtk_label_new( "Margins (inches):" );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_FALSE, PR_FALSE, 10);
+
+	table = gtk_table_new (1, 2, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	label = gtk_label_new( "Top: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.topSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Bottom: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.bottomSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+	
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Left: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.leftSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Right: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.rightSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+        hbox = gtk_hbox_new (PR_FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_TRUE, PR_FALSE, 5);
+	button = gtk_button_new_with_label ("Print");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (DoPrint), prOps );
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default (button);
+
+	button = gtk_button_new_with_label ("Cancel");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC ( CancelPrint ), prOps);
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	/* Do this here, otherwise, upon creation the callbacks will be
+           triggered and the widgets these callbacks set sensitivity on
+	   do not exist yet */
+
+      	gtk_signal_connect (GTK_OBJECT (prButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToPrinter), prOps);
+      	gtk_signal_connect (GTK_OBJECT (fileButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToFile), prOps);
+
+	gtk_widget_show_all( dialog );
+	gtk_main ();
+}
+
+/* public interface to print dialog. Caller passes in preferences using
+   argument, we return any changes and indication of whether to print
+   or cancel. */
+
+void
+UnixPrDialog( UnixPrData *prData )
+{
+	static UnixPrOps prOps;
+
+	prOps.prData = prData;
+	DoPrintGTK( (GtkWidget *) NULL, &prOps );
+}
+

mozilla/gfx/src/gtk/nsPrintdGTK.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; 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.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#ifndef nsPrintdGTK_h___
+#define nsPrintdGTK_h___
+
+#include <limits.h>
+
+PR_BEGIN_EXTERN_C
+
+/* stolen from nsPostScriptObj.h. needs to be put somewhere else that
+   both ps and gtk can see easily */
+
+#ifndef NS_LEGAL_SIZE
+#define NS_LETTER_SIZE    0
+#define NS_LEGAL_SIZE     1
+#define NS_EXECUTIVE_SIZE 2
+#define NS_A4_SIZE        3
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX	_POSIX_PATH_MAX
+#endif
+
+typedef struct unixprdata {
+        PRBool toPrinter;          /* If PR_TRUE, print to printer */
+        PRBool fpf;                /* If PR_TRUE, first page first */
+        PRBool grayscale;          /* If PR_TRUE, print grayscale */
+        int size;                   /* Paper size e.g., SizeLetter */
+        char command[ PATH_MAX ];   /* Print command e.g., lpr */
+        char path[ PATH_MAX ];      /* If toPrinter = PR_FALSE, dest file */
+	PRBool cancel;		    /* If PR_TRUE, user cancelled */
+	float left;		    /* left margin */
+	float right;		    /* right margin */
+	float top;		    /* top margin */
+	float bottom;		    /* bottom margin */
+} UnixPrData;
+
+void UnixPrDialog(UnixPrData *prData);
+
+PR_END_EXTERN_C
+
+#endif /* nsPrintdGTK_h___ */

mozilla/gfx/src/gtk/nsRegionGTK.cpp

@@ -0,0 +1,302 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include "nsRegionGTK.h"
+#include "xregion.h"
+#include "prmem.h"
+
+static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID);
+
+nsRegionGTK::nsRegionGTK()
+{
+  NS_INIT_REFCNT();
+  
+  mRegion = nsnull;
+  mRegionType = eRegionComplexity_empty;
+}
+
+nsRegionGTK::~nsRegionGTK()
+{
+   if (mRegion)
+     ::gdk_region_destroy(mRegion);
+  mRegion = nsnull;
+}
+
+NS_IMPL_QUERY_INTERFACE(nsRegionGTK, kRegionIID)
+NS_IMPL_ADDREF(nsRegionGTK)
+NS_IMPL_RELEASE(nsRegionGTK)
+
+nsresult nsRegionGTK::Init(void)
+{
+  NS_ADDREF_THIS();
+  mRegion = ::gdk_region_new();
+  mRegionType = eRegionComplexity_empty;
+  return NS_OK;
+}
+
+void nsRegionGTK::SetTo(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(const nsRegionGTK *aRegion)
+{
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, aRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  SetRegionEmpty();
+
+  GdkRectangle grect;
+
+  grect.x = aX;
+  grect.y = aY;
+  grect.width = aWidth;
+  grect.height = aHeight;
+  
+  GdkRegion *nRegion = ::gdk_region_union_with_rect(mRegion, &grect);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, tRegion);
+  ::gdk_region_destroy(tRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(const nsIRegion &aRegion)
+{
+   nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+   
+   GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+   GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+  
+  GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+PRBool nsRegionGTK::IsEmpty(void)
+{
+  return (::gdk_region_empty(mRegion));
+}
+
+PRBool nsRegionGTK::IsEqual(const nsIRegion &aRegion)
+{
+  nsRegionGTK *pRegion = (nsRegionGTK *)&aRegion;
+
+  return(::gdk_region_equal(mRegion, pRegion->mRegion));
+
+}
+
+void nsRegionGTK::GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight)
+{
+  GdkRectangle rect;
+
+  ::gdk_region_get_clipbox(mRegion, &rect);
+
+  *aX = rect.x;
+  *aY = rect.y;
+  *aWidth = rect.width;
+  *aHeight = rect.height;
+}
+
+void nsRegionGTK::Offset(PRInt32 aXOffset, PRInt32 aYOffset)
+{
+   ::gdk_region_offset(mRegion, aXOffset, aYOffset);
+}
+
+PRBool nsRegionGTK::ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkOverlapType containment;
+  GdkRectangle rect;
+   
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+   
+  containment = ::gdk_region_rect_in(mRegion, &rect);
+
+  if (containment != GDK_OVERLAP_RECTANGLE_OUT)
+    return PR_TRUE;
+  else
+    return PR_FALSE;
+
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRects(nsRegionRectSet **aRects)
+{
+  nsRegionRectSet   *rects;
+  GdkRegionPrivate  *priv = (GdkRegionPrivate *)mRegion;
+  Region            pRegion = priv->xregion;
+  int               nbox;
+  BOX               *pbox;
+  nsRegionRect      *rect;
+
+  NS_ASSERTION(!(nsnull == aRects), "bad ptr");
+
+  //code lifted from old xfe. MMP
+
+  pbox = pRegion->rects;
+  nbox = pRegion->numRects;
+
+  rects = *aRects;
+
+  if ((nsnull == rects) || (rects->mRectsLen < (PRUint32)nbox))
+  {
+    void *buf = PR_Realloc(rects, sizeof(nsRegionRectSet) + (sizeof(nsRegionRect) * (nbox - 1)));
+
+    if (nsnull == buf)
+    {
+      if (nsnull != rects)
+        rects->mNumRects = 0;
+
+      return NS_OK;
+    }
+
+    rects = (nsRegionRectSet *)buf;
+    rects->mRectsLen = nbox;
+  }
+
+  rects->mNumRects = nbox;
+  rects->mArea = 0;
+  rect = &rects->mRects[0];
+
+  while (nbox--)
+  {
+    rect->x = pbox->x1;
+    rect->width = (pbox->x2 - pbox->x1);
+    rect->y = pbox->y1;
+    rect->height = (pbox->y2 - pbox->y1);
+
+    rects->mArea += rect->width * rect->height;
+
+    pbox++;
+    rect++;
+  }
+
+  *aRects = rects;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::FreeRects(nsRegionRectSet *aRects)
+{
+  if (nsnull != aRects)
+    PR_Free((void *)aRects);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetNativeRegion(void *&aRegion) const
+{
+  aRegion = (void *)mRegion;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRegionComplexity(nsRegionComplexity &aComplexity) const
+{
+  // cast to avoid const-ness problems on some compilers
+  if (((nsRegionGTK*)this)->IsEmpty())
+    aComplexity = eRegionComplexity_empty;
+  else
+    aComplexity = eRegionComplexity_complex;
+
+  return NS_OK;
+}
+
+void nsRegionGTK::SetRegionEmpty()
+{
+  if (!IsEmpty()) {
+    ::gdk_region_destroy(mRegion);
+    mRegion = ::gdk_region_new();
+  }
+}
+
+GdkRegion *nsRegionGTK::CreateRectRegion(PRInt32 aX,
+					 PRInt32 aY,
+					 PRInt32 aWidth,
+					 PRInt32 aHeight)
+{
+  GdkRegion *tRegion = ::gdk_region_new();
+  GdkRectangle rect;
+
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+
+  GdkRegion *rRegion = ::gdk_region_union_with_rect(tRegion, &rect);
+  ::gdk_region_destroy(tRegion);
+  
+  return (rRegion);
+}

mozilla/gfx/src/gtk/nsRegionGTK.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsRegionGTK_h___
+#define nsRegionGTK_h___
+
+#include "nsIRegion.h"
+
+class nsRegionGTK : public nsIRegion
+{
+public:
+  nsRegionGTK();
+  virtual ~nsRegionGTK();
+
+  NS_DECL_ISUPPORTS
+
+  virtual nsresult Init();
+
+  virtual void SetTo(const nsIRegion &aRegion);
+  virtual void SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  void SetTo(const nsRegionGTK *aRegion);
+  virtual void Intersect(const nsIRegion &aRegion);
+  virtual void Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Union(const nsIRegion &aRegion);
+  virtual void Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Subtract(const nsIRegion &aRegion);
+  virtual void Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual PRBool IsEmpty(void);
+  virtual PRBool IsEqual(const nsIRegion &aRegion);
+  virtual void GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight);
+  virtual void Offset(PRInt32 aXOffset, PRInt32 aYOffset);
+  virtual PRBool ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD GetRects(nsRegionRectSet **aRects);
+  NS_IMETHOD FreeRects(nsRegionRectSet *aRects);
+  NS_IMETHOD GetNativeRegion(void *&aRegion) const;
+  NS_IMETHOD GetRegionComplexity(nsRegionComplexity &aComplexity) const;
+
+  GdkRegion *CreateRectRegion(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+
+private:
+  GdkRegion           *mRegion;
+  nsRegionComplexity  mRegionType;
+
+  virtual void SetRegionEmpty();
+
+};
+
+#endif  // nsRegionGTK_h___ 

mozilla/gfx/src/gtk/nsRenderingContextGTK.h

@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ */
+
+#ifndef nsRenderingContextGTK_h___
+#define nsRenderingContextGTK_h___
+
+#include "nsIRenderingContext.h"
+#include "nsUnitConversion.h"
+#include "nsFont.h"
+#include "nsIFontMetrics.h"
+#include "nsPoint.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "nsTransform2D.h"
+#include "nsIViewManager.h"
+#include "nsIWidget.h"
+#include "nsRect.h"
+#include "nsImageGTK.h"
+#include "nsIDeviceContext.h"
+#include "nsVoidArray.h"
+
+#include "nsDrawingSurfaceGTK.h"
+#include "nsRegionGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsRenderingContextGTK : public nsIRenderingContext
+{
+public:
+  nsRenderingContextGTK();
+  virtual ~nsRenderingContextGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsIWidget *aWindow);
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsDrawingSurface aSurface);
+
+  NS_IMETHOD Reset(void);
+
+  NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext);
+
+  NS_IMETHOD LockDrawingSurface(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                                void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                                PRUint32 aFlags);
+  NS_IMETHOD UnlockDrawingSurface(void);
+
+  NS_IMETHOD SelectOffScreenDrawingSurface(nsDrawingSurface aSurface);
+  NS_IMETHOD GetDrawingSurface(nsDrawingSurface *aSurface);
+  NS_IMETHOD GetHints(PRUint32& aResult);
+
+  NS_IMETHOD PushState(void);
+  NS_IMETHOD PopState(PRBool &aClipEmpty);
+
+  NS_IMETHOD IsVisibleRect(const nsRect& aRect, PRBool &aVisible);
+
+  NS_IMETHOD SetClipRect(const nsRect& aRect, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRect(nsRect &aRect, PRBool &aClipValid);
+  NS_IMETHOD SetClipRegion(const nsIRegion& aRegion, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRegion(nsIRegion **aRegion);
+
+  NS_IMETHOD SetLineStyle(nsLineStyle aLineStyle);
+  NS_IMETHOD GetLineStyle(nsLineStyle &aLineStyle);
+
+  NS_IMETHOD SetColor(nscolor aColor);
+  NS_IMETHOD GetColor(nscolor &aColor) const;
+
+  NS_IMETHOD SetFont(const nsFont& aFont);
+  NS_IMETHOD SetFont(nsIFontMetrics *aFontMetrics);
+
+  NS_IMETHOD GetFontMetrics(nsIFontMetrics *&aFontMetrics);
+
+  NS_IMETHOD Translate(nscoord aX, nscoord aY);
+  NS_IMETHOD Scale(float aSx, float aSy);
+  NS_IMETHOD GetCurrentTransform(nsTransform2D *&aTransform);
+
+  NS_IMETHOD CreateDrawingSurface(nsRect *aBounds, PRUint32 aSurfFlags, nsDrawingSurface &aSurface);
+  NS_IMETHOD DestroyDrawingSurface(nsDrawingSurface aDS);
+
+  NS_IMETHOD DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
+  NS_IMETHOD DrawPolyline(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawRect(const nsRect& aRect);
+  NS_IMETHOD DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillRect(const nsRect& aRect);
+  NS_IMETHOD FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+  NS_IMETHOD FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawEllipse(const nsRect& aRect);
+  NS_IMETHOD DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillEllipse(const nsRect& aRect);
+  NS_IMETHOD FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD DrawArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+
+  NS_IMETHOD GetWidth(char aC, nscoord &aWidth);
+  NS_IMETHOD GetWidth(PRUnichar aC, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const nsString& aString, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const char *aString, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const char *aString, PRUint32 aLength, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const PRUnichar *aString, PRUint32 aLength, nscoord &aWidth,
+                      PRInt32 *aFontID);
+
+  NS_IMETHOD DrawString(const char *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const PRUnichar *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY);
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY,
+                       nscoord aWidth, nscoord aHeight); 
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aRect);
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aSRect, const nsRect& aDRect);
+
+  NS_IMETHOD CopyOffScreenBits(nsDrawingSurface aSrcSurf, PRInt32 aSrcX, PRInt32 aSrcY,
+                               const nsRect &aDestBounds, PRUint32 aCopyFlags);
+
+  //locals
+  NS_IMETHOD CommonInit();
+
+protected:
+  nsDrawingSurfaceGTK   *mOffscreenSurface;  
+  nsDrawingSurfaceGTK   *mSurface;
+  nsIDeviceContext      *mContext;
+  nsIFontMetrics        *mFontMetrics;
+  nsRegionGTK           *mClipRegion;
+  nsTransform2D         *mTMatrix;
+  float                  mP2T;
+  GdkWChar*              mDrawStringBuf;
+  PRUint32               mDrawStringSize;
+
+ // graphic state stack (GraphicsState)
+  nsVoidArray           *mStateCache;
+
+  nscolor                mCurrentColor;
+  GdkFont               *mCurrentFont;
+  nsLineStyle            mCurrentLineStyle;
+};
+
+#endif /* nsRenderingContextGTK_h___ */

mozilla/gfx/src/gtk/xregion.h

@@ -0,0 +1,177 @@
+/* $XConsortium: region.h,v 11.13 91/09/10 08:21:49 rws Exp $ */
+/************************************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+#ifndef _XREGION_H
+#define _XREGION_H
+
+typedef struct {
+    short x1, x2, y1, y2;
+} Box, BOX, BoxRec, *BoxPtr;
+
+typedef struct {
+    short x, y, width, height;
+}RECTANGLE, RectangleRec, *RectanglePtr;
+
+#ifdef TRUE
+#undef TRUE
+#endif
+
+#define TRUE 1
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef MAXSHORT
+#define MAXSHORT 32767
+#endif
+#ifndef MINSHORT
+#define MINSHORT -MAXSHORT
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+/* 
+ *   clip region
+ */
+
+typedef struct _XRegion {
+    long size;
+    long numRects;
+    BOX *rects;
+    BOX extents;
+} REGION;
+
+/* Xutil.h contains the declaration: 
+ * typedef struct _XRegion *Region; 
+ */   
+
+/*  1 if two BOXs overlap.
+ *  0 if two BOXs do not overlap.
+ *  Remember, x2 and y2 are not in the region 
+ */
+#define EXTENTCHECK(r1, r2) \
+	((r1)->x2 > (r2)->x1 && \
+	 (r1)->x1 < (r2)->x2 && \
+	 (r1)->y2 > (r2)->y1 && \
+	 (r1)->y1 < (r2)->y2)
+
+/*
+ *  update region extents
+ */
+#define EXTENTS(r,idRect){\
+            if((r)->x1 < (idRect)->extents.x1)\
+              (idRect)->extents.x1 = (r)->x1;\
+            if((r)->y1 < (idRect)->extents.y1)\
+              (idRect)->extents.y1 = (r)->y1;\
+            if((r)->x2 > (idRect)->extents.x2)\
+              (idRect)->extents.x2 = (r)->x2;\
+            if((r)->y2 > (idRect)->extents.y2)\
+              (idRect)->extents.y2 = (r)->y2;\
+        }
+
+/*
+ *   Check to see if there is enough memory in the present region.
+ */
+#define MEMCHECK(reg, rect, firstrect){\
+        if ((reg)->numRects >= ((reg)->size - 1)){\
+          (firstrect) = (BOX *) Xrealloc \
+          ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\
+          if ((firstrect) == 0)\
+            return(0);\
+          (reg)->size *= 2;\
+          (rect) = &(firstrect)[(reg)->numRects];\
+         }\
+       }
+
+/*  this routine checks to see if the previous rectangle is the same
+ *  or subsumes the new rectangle to add.
+ */
+
+#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\
+               (!(((Reg)->numRects > 0)&&\
+                  ((R-1)->y1 == (Ry1)) &&\
+                  ((R-1)->y2 == (Ry2)) &&\
+                  ((R-1)->x1 <= (Rx1)) &&\
+                  ((R-1)->x2 >= (Rx2))))
+
+/*  add a rectangle to the given Region */
+#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\
+    if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\
+        CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              EXTENTS((r), (reg));\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+
+
+/*  add a rectangle to the given Region */
+#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\
+            if ((rx1 < rx2) && (ry1 < ry2) &&\
+                CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+#define EMPTY_REGION(pReg) pReg->numRects = 0
+
+#define REGION_NOT_EMPTY(pReg) pReg->numRects
+
+#define INBOX(r, x, y) \
+      ( ( ((r).x2 >  x)) && \
+        ( ((r).x1 <= x)) && \
+        ( ((r).y2 >  y)) && \
+        ( ((r).y1 <= y)) )
+
+/*
+ * number of points to buffer before sending them off
+ * to scanlines() :  Must be an even number
+ */
+#define NUMPTSTOBUFFER 200
+
+/*
+ * used to allocate buffers for points and link
+ * the buffers together
+ */
+typedef struct _POINTBLOCK {
+    XPoint pts[NUMPTSTOBUFFER];
+    struct _POINTBLOCK *next;
+} POINTBLOCK;
+
+#endif

mozilla/security/coreconf/AIX.mk

@@ -1,83 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX.
-#
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-#
-# There are two implementation strategies available on AIX:
-# pthreads, and pthreads-user.  The default is pthreads.
-# In both strategies, we need to use pthread_user.c, instead of
-# aix.c.  The fact that aix.c is never used is somewhat strange.
-# 
-# So we need to do the following:
-# - Default (PTHREADS_USER not defined in the environment or on
-#   the command line):
-#   Set PTHREADS_USER=1, USE_PTHREADS=1
-# - PTHREADS_USER=1 set in the environment or on the command line:
-#   Do nothing.
-#
-ifeq ($(PTHREADS_USER),1)
-	USE_PTHREADS =            # just to be safe
-	IMPL_STRATEGY = _PTH_USER
-else
-	USE_PTHREADS = 1
-	PTHREADS_USER = 1
-endif
-
-DEFAULT_COMPILER = xlC_r
-
-CC		= xlC_r
-CCC		= xlC_r
-
-CPU_ARCH	= rs6000
-
-RANLIB		= ranlib
-
-OS_CFLAGS	= -DAIX -DSYSV
-ifndef NS_USE_GCC
-	OS_CFLAGS += -qarch=com
-endif
-
-AIX_WRAP	= $(DIST)/lib/aixwrap.o
-AIX_TMP		= $(OBJDIR)/_aix_tmp.o
-ifdef MAPFILE
-EXPORT_RULES = -bexport:$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-                sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
-
-ifdef BUILD_OPT
-        OPTIMIZER += -qmaxmem=-1
-endif
-

mozilla/security/coreconf/AIX3.2.mk

@@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX3.2.5
-#
-include $(CORE_DEPTH)/coreconf/AIX.mk

mozilla/security/coreconf/AIX4.1.mk

@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX4.1
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-AIX_LINK_OPTS  += -bnso -berok
-#AIX_LINK_OPTS += -bnso -berok -brename:.select,.wrap_select -brename:.poll,.wrap_poll -bI:/usr/lib/syscalls.exp
-
-# The AIX4.1 linker had a bug which always looked for a dynamic library
-# with an extension of .a.  AIX4.2 fixed this problem
-DLL_SUFFIX = a
-
-OS_LIBS		+= -lsvld
-
-# override default value set in suffix.mk, for AIX 4.1 only
-DYNAMIC_LIB_EXTENSION = _shr
-
-# override default value in ruleset.mk
-ifdef LIBRARY_NAME
-    SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
-endif
-

mozilla/security/coreconf/AIX4.2.mk

@@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-#
-# Config stuff for AIX4.2
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-OS_CFLAGS	+= -DAIX4_2
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -L/usr/lpp/xlC/lib -lc -lm
-
-OS_LIBS		+= -L/usr/lpp/xlC/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS	+= -bexport:$(MAPFILE)
-else
-DSO_LDOPTS	+= -bexpall
-endif
-
-

mozilla/security/coreconf/AIX4.3.mk

@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX4.3
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-ifeq ($(USE_64), 1)
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-	OS_CFLAGS	+= -DAIX_64BIT
-	OBJECT_MODE=64
-	export OBJECT_MODE
-endif
-OS_CFLAGS	+= -DAIX4_3
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
-
-OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif

mozilla/security/coreconf/AIX5.1.mk

@@ -1,54 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX5.1
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-ifeq ($(USE_64), 1)
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-	OS_CFLAGS	+= -DAIX_64BIT
-	OBJECT_MODE=64
-	export OBJECT_MODE
-endif
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
-
-OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif

mozilla/security/coreconf/AIX5.2.mk

@@ -1,54 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for AIX5.2
-#
-
-include $(CORE_DEPTH)/coreconf/AIX.mk
-
-
-ifeq ($(USE_64), 1)
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-	OS_CFLAGS	+= -DAIX_64BIT
-	OBJECT_MODE=64
-	export OBJECT_MODE
-endif
-DSO_LDOPTS	= -brtl -bM:SRE -bnoentry
-MKSHLIB		= $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
-
-OS_LIBS		+= -blibpath:/usr/lib:/lib -lc -lm
-ifdef MAPFILE
-DSO_LDOPTS      += -bexport:$(MAPFILE)
-else
-DSO_LDOPTS      += -bexpall
-endif

mozilla/security/coreconf/BSD_OS.mk

@@ -1,88 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Netscape security libraries.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-#
-# Contributor(s): Kurt J. Lidl
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for BSD/OS
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER	= gcc
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-ifeq ($(OS_TEST),i386)
-	OS_REL_CFLAGS	= -D__i386__
-	CPU_ARCH	= x86
-else
-ifeq ($(OS_TEST),ppc)
-	OS_REL_CFLAGS	= -D__ppc__
-	CPU_ARCH	= ppc
-else
-ifeq ($(OS_TEST),sparc)
-	OS_REL_CFLAGS	= -D__sparc__
-	CPU_ARCH	= sparc
-else
-# treat the ultrasparc like a regular sparc, at least for now!
-ifeq ($(OS_TEST),sparc_v9)
-	OS_REL_CFLAGS	= -D__sparc__
-	CPU_ARCH	= sparc
-endif
-endif
-endif
-endif
-
-DLL_SUFFIX		= so
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -DBSD_OS -DBSDI -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-ARCH			= bsdos
-
-DSO_CFLAGS		= -fPIC -DPIC
-DSO_LDOPTS		= -shared
-DSO_LDFLAGS		=
-DSO_LDOPTS		+= -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-
-ifdef LIBRUNPATH
-DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
-endif
-
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-G++INCLUDES		= -I/usr/include/g++
-
-INCLUDES		+= -I/usr/X11R6/include

mozilla/security/coreconf/BeOS.mk

@@ -1,79 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2002 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for BeOS
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS)
-
-USE_PTHREADS = 
-
-ifeq ($(USE_PTHREADS),1)
-	IMPL_STRATEGY = _PTH
-endif
-
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-DEFAULT_COMPILER = gcc
-
-ifeq ($(OS_TEST),ppc)
-	OS_REL_CFLAGS	= -Dppc
-	CPU_ARCH	= ppc
-else
-	OS_REL_CFLAGS	= -Di386
-	CPU_ARCH	= x86
-endif
-
-MKSHLIB		= $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-	OPTIMIZER	= -O2
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -pipe
-OS_LIBS			= -lbe
-
-DEFINES			+= -DBEOS
-
-ifdef USE_PTHREADS
-	DEFINES		+= -D_REENTRANT
-endif
-
-ARCH			= beos
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		=
-DSO_LDFLAGS		=
-

mozilla/security/coreconf/Darwin.mk

@@ -1,78 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Darwin.
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-CC		= cc
-CCC		= c++
-RANLIB		= ranlib
-
-ifeq (86,$(findstring 86,$(OS_TEST)))
-OS_REL_CFLAGS	= -Di386
-CPU_ARCH	= i386
-else
-OS_REL_CFLAGS	= -Dppc
-CPU_ARCH	= ppc
-endif
-
-# "Commons" are tentative definitions in a global scope, like this:
-#     int x;
-# The meaning of a common is ambiguous.  It may be a true definition:
-#     int x = 0;
-# or it may be a declaration of a symbol defined in another file:
-#     extern int x;
-# Use the -fno-common option to force all commons to become true
-# definitions so that the linker can catch multiply-defined symbols.
-# Also, common symbols are not allowed with Darwin dynamic libraries.
-
-OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -no-cpp-precomp -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-ifdef BUILD_OPT
-OPTIMIZER	= -O2
-endif
-
-ARCH		= darwin
-
-# May override this with -bundle to create a loadable module.
-DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
-
-MKSHLIB		= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
-DLL_SUFFIX	= dylib
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-                sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
-
-G++INCLUDES	= -I/usr/include/g++

mozilla/security/coreconf/FreeBSD.mk

@@ -1,83 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for FreeBSD
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER	= gcc
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-ifeq ($(OS_TEST),alpha)
-CPU_ARCH		= alpha
-else
-CPU_ARCH		= x86
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
-
-#
-# The default implementation strategy for FreeBSD is pthreads.
-#
-ifndef CLASSIC_NSPR
-USE_PTHREADS		= 1
-DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-OS_LIBS			+= -pthread
-DSO_LDOPTS		+= -pthread
-endif
-
-ARCH			= freebsd
-
-MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX		= so
-else
-DLL_SUFFIX		= so.1.0
-endif
-
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-G++INCLUDES		= -I/usr/include/g++
-
-INCLUDES		+= -I/usr/X11R6/include

mozilla/security/coreconf/HP-UX.mk

@@ -1,76 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-#
-# Config stuff for HP-UX
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-CPU_ARCH   = hppa
-DLL_SUFFIX = sl
-CC         = cc
-CCC        = CC
-OS_CFLAGS  += -Ae $(DSO_CFLAGS) -DHPUX -D$(CPU_ARCH) -D_HPUX_SOURCE -D_USE_BIG_FDS
-
-ifeq ($(DEFAULT_IMPL_STRATEGY),_PTH)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR),1)
-		USE_PTHREADS =
-		IMPL_STRATEGY = _CLASSIC
-	endif
-	ifeq ($(PTHREADS_USER),1)
-		USE_PTHREADS =
-		IMPL_STRATEGY = _PTH_USER
-	endif
-endif
-
-ifdef PTHREADS_USER
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-LDFLAGS			= -z -Wl,+s
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-ifdef MAPFILE
-MKSHLIB += -c $(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-         sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@
-
-DSO_LDOPTS		= -b +h $(notdir $@)
-DSO_LDFLAGS		=
-
-# +Z generates position independent code for use in shared libraries.
-DSO_CFLAGS = +Z

mozilla/security/coreconf/HP-UXA.09.03.mk

@@ -1,44 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-#
-# On HP-UX 9, the default (and only) implementation strategy is
-# classic nspr.
-#
-ifeq ($(OS_RELEASE),A.09.03)
-	DEFAULT_IMPL_STRATEGY	 = _CLASSIC
-endif
-
-#
-# Config stuff for HP-UXA.09.03
-#
-include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk

mozilla/security/coreconf/HP-UXA.09.07.mk

@@ -1,43 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 9, the default (and only) implementation strategy is
-# classic nspr.
-#
-ifeq ($(OS_RELEASE),A.09.07)
-	DEFAULT_IMPL_STRATEGY	 = _CLASSIC
-endif
-
-#
-# Config stuff for HP-UXA.09.07
-#
-include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk

mozilla/security/coreconf/HP-UXA.09.mk

@@ -1,38 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-
-#
-# Config stuff for HP-UXA.09
-#
-include $(CORE_DEPTH)/coreconf/HP-UX.mk
-
-OS_CFLAGS += -DHPUX9

mozilla/security/coreconf/HP-UXB.10.01.mk

@@ -1,40 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-ifeq ($(OS_RELEASE),B.10.01)
-	DEFAULT_IMPL_STRATEGY	 = _CLASSIC
-endif
-
-#
-# Config stuff for HP-UXB.10.01
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk

mozilla/security/coreconf/HP-UXB.10.10.mk

@@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 10.10 and 10.20, the default implementation strategy is
-# pthreads (actually DCE threads).  Classic nspr is also available.
-#
-
-ifeq ($(OS_RELEASE),B.10.10)
-	DEFAULT_IMPL_STRATEGY 	 = _PTH
-endif
-
-#
-# Config stuff for HP-UXB.10.10
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
-
-OS_CFLAGS += -DHPUX10_10
-
-ifeq ($(USE_PTHREADS),1)
-	OS_CFLAGS	+= -D_REENTRANT
-endif

mozilla/security/coreconf/HP-UXB.10.20.mk

@@ -1,50 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 10.10 and 10.20, the default implementation strategy is
-# pthreads (actually DCE threads).  Classic nspr is also available.
-#
-
-ifeq ($(OS_RELEASE),B.10.20)
-	DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# Config stuff for HP-UXB.10.20
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
-
-OS_CFLAGS		+= -DHPUX10_20
-
-ifeq ($(USE_PTHREADS),1)
-	OS_CFLAGS	+= -D_REENTRANT
-endif

mozilla/security/coreconf/HP-UXB.10.30.mk

@@ -1,56 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 10.30 and 11.00, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.10.30)
-	DEFAULT_IMPL_STRATEGY	 = _PTH
-endif
-
-#
-# Config stuff for HP-UXB.10.30.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk
-
-OS_CFLAGS		+= -DHPUX10_30
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.00, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif

mozilla/security/coreconf/HP-UXB.10.mk

@@ -1,38 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for HP-UXB.10
-#
-include $(CORE_DEPTH)/coreconf/HP-UX.mk
-
-OS_CFLAGS += -DHPUX10
-OS_LIBS   += -lpthread -lm

mozilla/security/coreconf/HP-UXB.11.00.mk

@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 10.30 and 11.00, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.11.00)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.00, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-#
-# Config stuff for HP-UXB.11.00.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.11.mk

@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 10.30 and 11.x, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.11.11)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-#
-# Config stuff for HP-UXB.11.11.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.20.mk

@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2002 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 10.30 and 11.x, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.11.20)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-#
-# Config stuff for HP-UXB.11.x.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.22.mk

@@ -1,55 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2002 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On HP-UX 10.30 and 11.x, the default implementation strategy is
-# pthreads.  Classic nspr and pthreads-user are also available.
-#
-
-ifeq ($(OS_RELEASE),B.11.22)
-OS_CFLAGS		+= -DHPUX10
-DEFAULT_IMPL_STRATEGY = _PTH
-endif
-
-#
-# To use the true pthread (kernel thread) library on 10.30 and
-# 11.x, we should define _POSIX_C_SOURCE to be 199506L.
-# The _REENTRANT macro is deprecated.
-#
-
-ifdef USE_PTHREADS
-	OS_CFLAGS	+= -D_POSIX_C_SOURCE=199506L
-endif
-
-#
-# Config stuff for HP-UXB.11.x.
-#
-include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk

mozilla/security/coreconf/HP-UXB.11.mk

@@ -1,87 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for HP-UXB.11
-#
-include $(CORE_DEPTH)/coreconf/HP-UX.mk
-
-ifdef USE_LONG_LONGS
-USE_HYBRID = 1
-endif
-
-ifndef NS_USE_GCC
-    CCC                 = /opt/aCC/bin/aCC -ext
-    ifeq ($(USE_64), 1)
-	ifeq ($(OS_TEST), ia64)
-	    OS_CFLAGS	+= -Aa +e +p +DD64
-	else
-	    # Our HP-UX build machine has a strange problem.  If
-	    # a 64-bit PA-RISC executable calls getcwd() in a
-	    # network-mounted directory, it fails with ENOENT.
-	    # We don't know why.  Since nsinstall calls getcwd(),
-	    # this breaks our 64-bit HP-UX nightly builds.  None
-	    # of our other HP-UX machines have this problem.
-	    #
-	    # We worked around this problem by building nsinstall
-	    # as a 32-bit PA-RISC executable for 64-bit PA-RISC
-	    # builds.  -- wtc 2003-06-03
-	    ifdef INTERNAL_TOOLS
-	    OS_CFLAGS	+= +DAportable +DS2.0
-	    else
-	    OS_CFLAGS	+= -Aa +e +DA2.0W +DS2.0 +DChpux
-	    endif
-	endif
-# Next line replaced by generic name handling in arch.mk
-#	COMPILER_TAG    = _64
-    else
-	ifeq ($(OS_TEST), ia64)
-	    OS_CFLAGS	+= -Aa +e +p +DD32
-	else
-	    ifdef USE_HYBRID
-		OS_CFLAGS += -Aa +e +DA2.0 +DS2.0 
-	    else
-		OS_CFLAGS += +DAportable +DS2.0
-	    endif
-	endif
-    endif
-else
-    CCC = aCC
-endif
-
-OS_CFLAGS += -DHPUX11 
-OS_LIBS   += -lpthread -lm -lrt
-#ifeq ($(USE_64), 1)
-#OS_LIBS   += -ldl
-#else
-#OS_LIBS   += -ldld
-#endif
-HPUX11	= 1

mozilla/security/coreconf/IRIX.mk

@@ -1,124 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-#
-# The default implementation strategy for Irix is classic nspr.
-#
-ifeq ($(USE_PTHREADS),1)
-	ifeq ($(USE_N32),1)
-		IMPL_STRATEGY = _n32_PTH
-	else
-		IMPL_STRATEGY = _PTH
-	endif
-endif
-
-DEFAULT_COMPILER = cc
-
-ifdef NS_USE_GCC
-	CC		= gcc
-	AS		= $(CC) -x assembler-with-cpp
-	ODD_CFLAGS	= -Wall -Wno-format
-	ifdef BUILD_OPT
-		OPTIMIZER	= -O6
-	endif
-else
-	CC	= cc
-	CCC		= CC
-	ODD_CFLAGS	= -fullwarn -xansi -woff 1209
-	ifdef BUILD_OPT
-		ifeq ($(USE_N32),1)
-			OPTIMIZER	= -O -OPT:Olimit=4000
-		else
-			OPTIMIZER	= -O -Olimit 4000
-		endif
-	endif
-
-	# For 6.x machines, include this flag
-	ifeq (6., $(findstring 6., $(OS_RELEASE)))
-		ifeq ($(USE_N32),1)
-			ODD_CFLAGS	+= -n32 -mips3 -exceptions
-		else
-			ODD_CFLAGS	+= -32 -multigot
-		endif
-	else
-		ODD_CFLAGS		+= -xgot
-	endif
-	ifeq ($(USE_N32),1)
-		OS_CFLAGS	+= -dollar
-	endif
-endif
-
-ODD_CFLAGS	+= -DSVR4 -DIRIX 
-
-CPU_ARCH	= mips
-
-RANLIB		= /bin/true
-# For purify
-# NOTE: should always define _SGI_MP_SOURCE
-NOMD_OS_CFLAGS += $(ODD_CFLAGS) -D_SGI_MP_SOURCE
-
-OS_CFLAGS += $(NOMD_OS_CFLAGS)
-ifdef USE_MDUPDATE
-	OS_CFLAGS += -MDupdate $(DEPENDENCIES)
-endif
-
-ifeq ($(USE_N32),1)
-	SHLIB_LD_OPTS	+= -n32 -mips3
-endif
-
-MKSHLIB     += $(LD) $(SHLIB_LD_OPTS) -shared -soname $(@:$(OBJDIR)/%.so=%.so)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-DSO_LDOPTS	= -elf -shared -all
-
-ifdef DSO_BACKEND
-	DSO_LDOPTS += -soname $(DSO_NAME)
-endif
-
-#
-# Revision notes:
-#
-# In the IRIX compilers prior to version 7.2, -n32 implied -mips3.
-# Beginning in the 7.2 compilers, -n32 implies -mips4 when the compiler
-# is running on a system with a mips4 CPU (e.g. R8K, R10K).
-# We want our code to explicitly be mips3 code, so we now explicitly
-# set -mips3 whenever we set -n32.
-#

mozilla/security/coreconf/IRIX5.2.mk

@@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX 5.2
-#
-include $(CORE_DEPTH)/coreconf/IRIX5.mk

mozilla/security/coreconf/IRIX5.3.mk

@@ -1,37 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX 5.3
-#
-include $(CORE_DEPTH)/coreconf/IRIX5.mk
-
-OS_CFLAGS += -DIRIX5_3

mozilla/security/coreconf/IRIX5.mk

@@ -1,40 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX 5
-#
-
-include $(CORE_DEPTH)/coreconf/IRIX.mk
-
-ifndef NS_USE_GCC
-	ODD_CFLAGS += -xgot
-endif

mozilla/security/coreconf/IRIX6.2.mk

@@ -1,43 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX 6.2
-#
-
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_2

mozilla/security/coreconf/IRIX6.3.mk

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX 6.3
-#
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_3

mozilla/security/coreconf/IRIX6.5.mk

@@ -1,45 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX 6.5
-#
-
-# catch unresolved symbols
-
-SHLIB_LD_OPTS += -no_unresolved
-
-include $(CORE_DEPTH)/coreconf/IRIX6.mk
-
-OS_CFLAGS += -DIRIX6_5
-ifndef NS_USE_GCC
-OS_CFLAGS += -mips3
-endif

mozilla/security/coreconf/IRIX6.mk

@@ -1,47 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for IRIX 6
-#
-
-include $(CORE_DEPTH)/coreconf/IRIX.mk
-
-ifndef NS_USE_GCC
-	ifneq ($(USE_N32),1)
-	OS_CFLAGS  += -32
-	endif
-	ODD_CFLAGS += -multigot
-endif
-
-ifeq ($(USE_PTHREADS),1)
-OS_LIBS += -lpthread
-endif

mozilla/security/coreconf/Linux.mk

@@ -1,150 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-#
-# The default implementation strategy for Linux is now pthreads
-#
-USE_PTHREADS = 1
-
-ifeq ($(USE_PTHREADS),1)
-	IMPL_STRATEGY = _PTH
-endif
-
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-DEFAULT_COMPILER = gcc
-
-ifeq ($(OS_TEST),m68k)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= m68k
-else		
-ifeq ($(OS_TEST),ppc)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= ppc
-else
-ifeq ($(OS_TEST),alpha)
-        OS_REL_CFLAGS   = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= alpha
-else
-ifeq ($(OS_TEST),ia64)
-	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH	= ia64
-else
-ifeq ($(OS_TEST),sparc)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = sparc
-else
-ifeq ($(OS_TEST),sparc64)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = sparc
-else
-ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = arm
-else
-ifeq ($(OS_TEST),parisc64)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = hppa
-else
-ifeq ($(OS_TEST),s390)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = s390
-else
-ifeq ($(OS_TEST),s390x)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = s390x
-else
-ifeq ($(OS_TEST),mips)
-	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
-	CPU_ARCH        = mips
-else
-	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
-	CPU_ARCH	= x86
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-
-
-LIBC_TAG		= _glibc
-
-ifeq ($(OS_RELEASE),2.0)
-	OS_REL_CFLAGS	+= -DLINUX2_0
-	MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-	ifdef BUILD_OPT
-		OPTIMIZER	= -O2
-	endif
-	ifdef MAPFILE
-		MKSHLIB += -Wl,--version-script,$(MAPFILE)
-	endif
-	PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-         sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-endif
-
-ifeq ($(USE_PTHREADS),1)
-OS_PTHREAD = -lpthread 
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
-OS_LIBS			= -L/lib $(OS_PTHREAD) -ldl -lc
-
-ifdef USE_PTHREADS
-	DEFINES		+= -D_REENTRANT
-endif
-
-ARCH			= linux
-
-DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -shared
-DSO_LDFLAGS		=
-
-# INCLUDES += -I/usr/include -Y/usr/include/linux
-G++INCLUDES		= -I/usr/include/g++
-
-#
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
-#
-CPU_TAG = _$(CPU_ARCH)

mozilla/security/coreconf/Linux2.1.mk

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux 2.1 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk
-ifeq ($(OS_RELEASE),2.1)
-        OS_REL_CFLAGS   += -DLINUX2_1
-        MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-        ifdef BUILD_OPT
-                OPTIMIZER       = -O2
-        endif
-	ifdef MAPFILE
-		MKSHLIB += -Wl,--version-script,$(MAPFILE)
-	endif
-	PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-       	 sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-endif
-

mozilla/security/coreconf/Linux2.2.mk

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux 2.2 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk
-
-OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
-
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/Linux2.4.mk

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux 2.4 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk
-
-OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
-
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/Linux2.5.mk

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux 2.5 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk
-
-OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
-
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/Linux2.6.mk

@@ -1,49 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux 2.6 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk
-
-OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-            OPTIMIZER       = -O2
-endif
-
-ifdef MAPFILE
-	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
-        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-

mozilla/security/coreconf/LinuxELF1.2.mk

@@ -1,36 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux 1.2 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk

mozilla/security/coreconf/LinuxELF2.0.mk

@@ -1,36 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Linux 2.0 (ELF)
-#
-
-include $(CORE_DEPTH)/coreconf/Linux.mk

mozilla/security/coreconf/Makefile

@@ -1,43 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-DEPTH		= ..
-CORE_DEPTH	= ..
-
-MODULE		= coreconf
-
-DIRS		= nsinstall
-
-include $(DEPTH)/coreconf/config.mk
-include $(DEPTH)/coreconf/rules.mk
-
-export:: libs

mozilla/security/coreconf/NCR3.0.mk

@@ -1,95 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for NCR SysVr4 v 3.0
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-###
-NS_USE_NATIVE = 1
-
-# NS_USE_GCC = 1
-
-export PATH:=$(PATH):/opt/ncc/bin
-###
-
-RANLIB           = true
-GCC_FLAGS_EXTRA += -pipe
-
-DEFINES		+= -DSVR4 -DSYSV -DHAVE_STRERROR -DNCR
-
-OS_CFLAGS	+= -Hnocopyr -DSVR4 -DSYSV -DHAVE_STRERROR -DNCR -DPRFSTREAMS_BROKEN
-
-ifdef NS_USE_NATIVE
-	CC       = cc
-	CCC      = ncc
-	CXX      = ncc
-#	OS_LIBS += -L/opt/ncc/lib 
-else
-#	OS_LIBS	+=
-endif
-
-#OS_LIBS    += -lsocket -lnsl -ldl -lc
-
-MKSHLIB     += $(LD) $(DSO_LDOPTS)
-#DSO_LDOPTS += -G -z defs
-DSO_LDOPTS += -G
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-CPU_ARCH    = x86
-ARCH        = ncr
-
-NOSUCHFILE  = /solaris-rm-f-sucks
-
-# now take care of default GCC (rus@5/5/97)
- 
-ifdef NS_USE_GCC
-	# if gcc-settings are redefined already - don't touch it
-	#
-	ifeq (,$(findstring gcc, $(CC)))
-		CC   = gcc
-		CCC  = g++
-		CXX  = g++
-		# always use -fPIC - some makefiles are still broken and don't distinguish
-		# situation when they build shared and static libraries
-		CFLAGS  += -fPIC -Wall $(GCC_FLAGS_EXTRA)
-#		OS_LIBS += -L/usr/local/lib -lstdc++ -lg++ -lgcc
-	endif
-endif
-###

mozilla/security/coreconf/NEC4.2.mk

@@ -1,66 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for NEC Mips SYSV
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = $(CORE_DEPTH)/build/hcc
-
-CPU_ARCH		= mips
-
-ifdef NS_USE_GCC
-CC			= gcc
-CCC			= g++
-else
-CC			= $(CORE_DEPTH)/build/hcc
-OS_CFLAGS		= -Xa -KGnum=0 -KOlimit=4000
-CCC			= g++
-endif
-
-MKSHLIB			= $(LD) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-RANLIB			= /bin/true
-
-OS_CFLAGS		+= $(ODD_CFLAGS) -DSVR4 -D__SVR4 -DNEC -Dnec_ews -DHAVE_STRERROR
-OS_LIBS			= -lsocket -lnsl -ldl $(LDOPTIONS)
-LDOPTIONS		= -lc -L/usr/ucblib -lucb
-
-NOSUCHFILE		= /nec-rm-f-sucks
-
-DSO_LDOPTS		= -G

mozilla/security/coreconf/NetBSD.mk

@@ -1,86 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Netscape security libraries.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for NetBSD
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER	= gcc
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-CPU_ARCH		:= $(shell uname -p)
-ifeq ($(CPU_ARCH),i386)
-OS_REL_CFLAGS		= -Di386
-CPU_ARCH		= x86
-endif
-
-ifndef OBJECT_FMT
-OBJECT_FMT		:= $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
-endif
-
-ifeq ($(OBJECT_FMT),ELF)
-DLL_SUFFIX		= so
-else
-DLL_SUFFIX		= so.1.0
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DNETBSD -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-OS_LIBS			= -lcompat
-
-ARCH			= netbsd
-
-DSO_CFLAGS		= -fPIC -DPIC
-DSO_LDOPTS		= -shared
-DSO_LDFLAGS		=
-ifeq ($(OBJECT_FMT),ELF)
-DSO_LDOPTS		+= -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-endif
-
-ifdef LIBRUNPATH
-DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
-endif
-
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-
-G++INCLUDES		= -I/usr/include/g++
-
-INCLUDES		+= -I/usr/X11R6/include

mozilla/security/coreconf/OS2.mk

@@ -1,276 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-MOZ_WIDGET_TOOLKIT = os2
-
-# Specify toolset.  Default to EMX.
-ifeq ($(MOZ_OS2_TOOLS),VACPP)
-XP_OS2_VACPP = 1
-else
-ifeq ($(MOZ_OS2_TOOLS),PGCC)
-XP_OS2_EMX   = 1
-else
-MOZ_OS2_TOOLS = EMX
-XP_OS2_EMX   = 1
-endif
-endif
-
-# XP_PC is for Window and OS2 on Intel X86
-# XP_OS2 is strictly for OS2 only
-XP_DEFINE  += -DXP_PC=1  -DXP_OS2=1
-
-# Override prefix
-LIB_PREFIX  = $(NULL)
-
-# Override suffix in suffix.mk
-LIB_SUFFIX  = lib
-DLL_SUFFIX  = dll
-PROG_SUFFIX = .exe
-
-
-ifdef XP_OS2_EMX
-
-CCC			= gcc
-LINK			= gcc
-AR                      = emxomfar r $@
-# Keep AR_FLAGS blank so that we do not have to change rules.mk
-AR_FLAGS                = 
-RANLIB 			= @echo OS2 RANLIB
-BSDECHO 		= @echo OS2 BSDECHO
-IMPLIB			= emximp -o
-FILTER			= emxexp -o
-
-# GCC for OS/2 currently predefines these, but we don't want them
-DEFINES 		+= -Uunix -U__unix -U__unix__
-
-DEFINES			+= -DTCPV40HDRS
-
-ifndef NO_SHARED_LIB
-WRAP_MALLOC_LIB         = 
-WRAP_MALLOC_CFLAGS      = 
-DSO_CFLAGS              = 
-DSO_PIC_CFLAGS          = 
-MKSHLIB                 = $(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@
-MKCSHLIB                = $(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@
-MKSHLIB_FORCE_ALL       = 
-MKSHLIB_UNFORCE_ALL     = 
-DSO_LDOPTS              = -Zomf -Zdll
-SHLIB_LDSTARTFILE	= 
-SHLIB_LDENDFILE		= 
-ifdef MAPFILE
-MKSHLIB += $(MAPFILE)
-endif
-PROCESS_MAP_FILE = \
-	echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@; \
-	echo PROTMODE >> $@; \
-	echo CODE    LOADONCALL MOVEABLE DISCARDABLE >> $@; \
-	echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@; \
-	echo EXPORTS >> $@; \
-	grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,\([\t ]*\),\1_,' | \
-	awk 'BEGIN {ord=1;} { print($$0 " @" ord " RESIDENTNAME"); ord++;}' >> $@
-
-endif   #NO_SHARED_LIB
-
-OS_CFLAGS          = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Zomf -DDEBUG -DTRACING -g
-
-# Where the libraries are
-MOZ_COMPONENT_NSPR_LIBS=-L$(DIST)/lib $(NSPR_LIBS)
-NSPR_LIBS	= -lplds4 -lplc4 -lnspr4 
-NSPR_INCLUDE_DIR =   
-
-
-ifdef BUILD_OPT
-OPTIMIZER		= -O2 -s
-DEFINES 		+= -UDEBUG -U_DEBUG -DNDEBUG
-DLLFLAGS		= -DLL -OUT:$@ -MAP:$(@:.dll=.map)
-EXEFLAGS    		= -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
-OBJDIR_TAG 		= _OPT
-else
-#OPTIMIZER		= -O+ -Oi
-DEFINES 		+= -DDEBUG -D_DEBUG -DDEBUGPRINTS     #HCT Need += to avoid overidding manifest.mn 
-DLLFLAGS		= -DEBUG -DLL -OUT:$@ -MAP:$(@:.dll=.map)
-EXEFLAGS    		= -DEBUG -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
-OBJDIR_TAG 		= _DBG
-LDFLAGS 		= -DEBUG 
-endif   # BUILD_OPT
-
-else    # XP_OS2_VACPP
-
-# Override suffix in suffix.mk
-OBJ_SUFFIX  = .obj
-ASM_SUFFIX  = .asm
-
-AS = alp.exe
-ifdef BUILD_OPT
-ASFLAGS = -Od
-else
-ASFLAGS = +Od
-endif
-CCC			= icc -q -DXP_OS2 -DOS2=4 -N10
-LINK			= -ilink
-AR		= -ilib /NOL /NOI /O:$(subst /,\\,$@)
-# Keep AR_FLAGS blank so that we do not have to change rules.mk
-AR_FLAGS                = 
-RANLIB 			= @echo OS2 RANLIB
-BSDECHO 		= @echo OS2 BSDECHO
-IMPLIB    = implib /NOL /NOI
-FILTER    = cppfilt -b -p -q
-
-ifndef NO_SHARED_LIB
-WRAP_MALLOC_LIB         = 
-WRAP_MALLOC_CFLAGS      = 
-DSO_CFLAGS              = 
-DSO_PIC_CFLAGS          = 
-MKSHLIB                 = $(LD) $(DSO_LDOPTS)
-MKCSHLIB                = $(LD) $(DSO_LDOPTS)
-MKSHLIB_FORCE_ALL       = 
-MKSHLIB_UNFORCE_ALL     = 
-DSO_LDOPTS              = 
-# DLL_SUFFIX              = .dll
-SHLIB_LDSTARTFILE	= 
-SHLIB_LDENDFILE		= 
-ifdef MAPFILE
-MKSHLIB += $(MAPFILE)
-endif
-PROCESS_MAP_FILE = \
-	echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@; \
-	echo PROTMODE >> $@; \
-	echo CODE    LOADONCALL MOVEABLE DISCARDABLE >> $@; \
-	echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >> $@; \
-	echo EXPORTS >> $@; \
-	grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-	sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' >> $@
-endif   #NO_SHARED_LIB
-
-OS_CFLAGS          = /Q /qlibansi /Gd /Gm /Su4 /Mp /Tl-
-INCLUDES        += -I$(CORE_DEPTH)/../dist/include
-DEFINES         += -DXP_OS2_VACPP -DTCPV40HDRS
-
-# Where the libraries are
-NSPR_LIBS	= $(DIST)/lib/nspr4.lib $(DIST)/lib/plc4.lib $(DIST)/lib/plds4.lib
-MOZ_COMPONENT_NSPR_LIBS=-L$(DIST)/lib $(NSPR_LIBS)
-NSPR_INCLUDE_DIR =   
-
-
-DLLFLAGS    = /DLL /O:$@ /INC:_dllentry /MAP:$(@:.dll=.map)
-EXEFLAGS    = -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE
-LDFLAGS     = /FREE /NOE /LINENUMBERS /nologo
-
-ifdef BUILD_OPT
-OPTIMIZER		= /O+ /Gl+ /G5 /qarch=pentium
-DEFINES 		+= -UDEBUG -U_DEBUG -DNDEBUG
-OBJDIR_TAG 		= _OPT
-LDFLAGS     += /NODEBUG /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA
-else
-OS_CFLAGS   += /Ti+
-DEFINES 		+= -DDEBUG -D_DEBUG -DDEBUGPRINTS     #HCT Need += to avoid overidding manifest.mn 
-DLLFLAGS    += /DE
-EXEFLAGS    += /DE
-OBJDIR_TAG 		= _DBG
-LDFLAGS     += /DE
-endif   # BUILD_OPT
-
-endif   # XP_OS2_VACPP
-
-# OS/2 use nsinstall that is included in the toolkit.
-# since we do not wish to support and maintain 3 version of nsinstall in mozilla, nspr and nss
-
-ifdef BUILD_TREE
-NSINSTALL_DIR  = $(BUILD_TREE)/nss
-else
-NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
-endif
-# NSINSTALL      = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall
-NSINSTALL 	= nsinstall             # HCT4OS2
-INSTALL		= $(NSINSTALL)
-
-MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
-MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
-MKDEPENDENCIES  = $(OBJDIR_NAME)/depend.mk
-
-####################################################################
-#
-# One can define the makefile variable NSDISTMODE to control
-# how files are published to the 'dist' directory.  If not
-# defined, the default is "install using relative symbolic
-# links".  The two possible values are "copy", which copies files
-# but preserves source mtime, and "absolute_symlink", which
-# installs using absolute symbolic links.  The "absolute_symlink"
-# option requires NFSPWD.
-#   - THIS IS NOT PART OF THE NEW BINARY RELEASE PLAN for 9/30/97
-#   - WE'RE KEEPING IT ONLY FOR BACKWARDS COMPATIBILITY
-####################################################################
-
-ifeq ($(NSDISTMODE),copy)
-	# copy files, but preserve source mtime
-	INSTALL  = $(NSINSTALL)
-	INSTALL += -t
-else
-	ifeq ($(NSDISTMODE),absolute_symlink)
-		# install using absolute symbolic links
-		INSTALL  = $(NSINSTALL)
-		INSTALL += -L `$(NFSPWD)`
-	else
-		# install using relative symbolic links
-		INSTALL  = $(NSINSTALL)
-		INSTALL += -R
-	endif
-endif
-
-DEFINES += -DXP_OS2
-
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
-endef
-
-#
-# override the definition of DLL_PREFIX in prefix.mk
-#
-
-ifndef DLL_PREFIX
-    DLL_PREFIX = $(NULL)
-endif
-
-#
-# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
-#
-ifndef TARGETS
-    TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
-endif
-
-
-ifdef LIBRARY_NAME
-    IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
-endif
-

mozilla/security/coreconf/OSF1.mk

@@ -1,72 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for DEC OSF/1
-#
-
-#
-# The Bourne shell (sh) on OSF1 doesn't handle "set -e" correctly,
-# which we use to stop LOOP_OVER_DIRS submakes as soon as any
-# submake fails.  So we use the Korn shell instead.
-#
-SHELL = /usr/bin/ksh
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-CC         = cc
-OS_CFLAGS += $(NON_LD_FLAGS) -std1
-CCC        = cxx
-RANLIB     = /bin/true
-CPU_ARCH   = alpha
-
-ifdef BUILD_OPT
-	OPTIMIZER += -Olimit 4000
-endif
-
-NON_LD_FLAGS += -ieee_with_inexact
-OS_CFLAGS    += -DOSF1 -D_REENTRANT 
-
-ifeq ($(USE_PTHREADS),1)
-	OS_CFLAGS += -pthread
-endif
-
-# The command to build a shared library on OSF1.
-MKSHLIB    += ld -shared -expect_unresolved "*" -soname $(notdir $@)
-ifdef MAPFILE
-MKSHLIB += -hidden -input $(MAPFILE)
-endif
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
- sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,-exported_symbol ,' > $@
-
-DSO_LDOPTS += -shared

mozilla/security/coreconf/OSF1V2.0.mk

@@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for DEC OSF/1 V2.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk

mozilla/security/coreconf/OSF1V3.0.mk

@@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for DEC OSF/1 V3.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk

mozilla/security/coreconf/OSF1V3.2.mk

@@ -1,44 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On OSF1 V3.2, classic nspr is the default (and only) implementation
-# strategy.
-#
-
-#
-# Config stuff for DEC OSF/1 V3.2
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
-
-ifeq ($(OS_RELEASE),V3.2)
-	OS_CFLAGS += -DOSF1V3
-endif

mozilla/security/coreconf/OSF1V4.0.mk

@@ -1,51 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On OSF1 V4.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-#
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V4.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk
-
-ifeq ($(OS_RELEASE),V4.0)
-	OS_CFLAGS += -DOSF1V4
-endif

mozilla/security/coreconf/OSF1V4.0B.mk

@@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for DEC OSF/1 V4.0B
-#
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk

mozilla/security/coreconf/OSF1V4.0D.mk

@@ -1,39 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for DEC OSF/1 V4.0D
-#
-include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk
-DEFINES	+= -DOSF1V4D
-
-OS_LIBS += -lpthread -lrt
-

mozilla/security/coreconf/OSF1V5.0.mk

@@ -1,47 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On OSF1 V5.0, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-#
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V5.0
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk

mozilla/security/coreconf/OSF1V5.1.mk

@@ -1,47 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# On OSF1 V5.1, pthreads is the default implementation strategy.
-# Classic nspr is also available.
-#
-ifneq ($(OS_RELEASE),V3.2)
-	USE_PTHREADS = 1
-	ifeq ($(CLASSIC_NSPR), 1)
-		USE_PTHREADS =
-		IMPL_STRATEGY := _CLASSIC
-	endif
-endif
-
-#
-# Config stuff for DEC OSF/1 V5.1
-#
-include $(CORE_DEPTH)/coreconf/OSF1.mk

mozilla/security/coreconf/OpenBSD.mk

@@ -1,69 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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 the Netscape security libraries.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for OpenBSD 
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER	= gcc
-CC			= gcc
-CCC			= g++
-RANLIB			= ranlib
-
-CPU_ARCH		:= $(shell uname -p)
-ifeq ($(CPU_ARCH),i386)
-OS_REL_CFLAGS		= -Di386
-CPU_ARCH		= x86
-endif
-
-ifndef CLASSIC_NSPR
-USE_PTHREADS		= 1
-DEFINES			+= -D_THREAD_SAFE -pthread
-OS_LIBS			+= -pthread
-DSO_LDOPTS		+= -pthread
-endif
-
-DLL_SUFFIX		= so.1.0
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
-
-OS_LIBS			= 
-
-ARCH			= openbsd
-
-DSO_CFLAGS		= -fPIC -DPIC
-DSO_LDOPTS		= -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-DSO_LDFLAGS		=
-
-MKSHLIB			= $(CC) $(DSO_LDOPTS)
-

mozilla/security/coreconf/OpenUNIX.mk

@@ -1,91 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Open UNIX 8.
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = gcc
-
-CC         = gcc
-OS_CFLAGS += -fPIC
-CCC        = g++
-CCC       += -DPRFSTREAMS_BROKEN -I/usr/gnu/lib/g++-include
-# CCC      = $(CORE_DEPTH)/build/hcpp
-# CCC     += +.cpp +w
-RANLIB     = /bin/true
-
-#
-# -DSCO_PM - Policy Manager AKA: SCO Licensing
-# -DSCO - Changes to Netscape source (consistent with AIX, LINUX, etc..)
-# -Dsco - Needed for /usr/include/X11/*
-#
-OS_CFLAGS   += -DSCO_SV -DSYSV -D_SVID3 -DHAVE_STRERROR -DSW_THREADS -DSCO_PM -DSCO -Dsco
-#OS_LIBS     += -lpmapi -lsocket -lc
-MKSHLIB      = $(LD)
-MKSHLIB     += $(DSO_LDOPTS)
-XINC         = /usr/include/X11
-MOTIFLIB    += -lXm
-INCLUDES    += -I$(XINC)
-CPU_ARCH     = x86
-GFX_ARCH     = x
-ARCH         = sco
-LOCALE_MAP   = $(CORE_DEPTH)/cmd/xfe/intl/sco.lm
-EN_LOCALE    = C
-DE_LOCALE    = de_DE.ISO8859-1
-FR_LOCALE    = fr_FR.ISO8859-1
-JP_LOCALE    = ja
-SJIS_LOCALE  = ja_JP.SJIS
-KR_LOCALE    = ko_KR.EUC
-CN_LOCALE    = zh
-TW_LOCALE    = zh
-I2_LOCALE    = i2
-LOC_LIB_DIR  = /usr/lib/X11
-NOSUCHFILE   = /solaris-rm-f-sucks
-BSDECHO      = /bin/echo
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-#
-# These defines are for building unix plugins
-#
-BUILD_UNIX_PLUGINS  = 1
-#DSO_LDOPTS         += -b elf -G -z defs
-DSO_LDOPTS         += -G
-DSO_LDFLAGS        += -nostdlib -L/lib -L/usr/lib -lXm -lXt -lX11 -lgen
-
-# Used for Java compiler
-EXPORT_FLAGS += -W l,-Bexport

mozilla/security/coreconf/OpenVMS.mk

@@ -1,60 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.1 (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.
-#
-
-#
-# Config stuff for Compaq OpenVMS
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-CC			= cc
-CCC			= cxx
-
-RANLIB			= /gnu/bin/true
-
-CPU_ARCH		:= $(shell uname -Wh)
-
-OS_CFLAGS		= -DVMS
-OS_CXXFLAGS		= -DVMS
-
-# Maybe this should go into rules.mk or something?
-ifdef NSPR_INCLUDE_DIR
-INCLUDES += -I$(NSPR_INCLUDE_DIR)
-endif
-
-#
-# XCFLAGS are the only CFLAGS that are used during a link operation. Defining
-# OPTIMIZER in XCFLAGS means that each compilation line gets OPTIMIZER
-# included twice, but at least we get OPTIMIZER included in the link
-# operations; and OpenVMS needs it!
-#
-XCFLAGS                        += $(OPTIMIZER)
-
-DSO_LDOPTS	= -shared -auto_symvec
-MKSHLIB		= $(CC) $(OPTIMIZER) $(LDFLAGS) $(DSO_LDOPTS)
-
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-
-#
-# Always set CPU_TAG on Linux, OpenVMS, WINCE.
-#
-CPU_TAG = _$(CPU_ARCH)

mozilla/security/coreconf/OpenVMSV7.1-2.mk

@@ -1,22 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.1 (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.
-#
-
-#
-# Config stuff for Compaq OpenVMS
-#
-
-include $(CORE_DEPTH)/coreconf/OpenVMS.mk

mozilla/security/coreconf/QNX.mk

@@ -1,70 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for QNX
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-USE_PTHREADS = 1
-
-ifeq ($(USE_PTHREADS),1)
-	IMPL_STRATEGY = _PTH
-endif
-
-CC			= qcc
-CCC			= qcc
-RANLIB			= ranlib
-
-DEFAULT_COMPILER = qcc
-ifeq ($(OS_TEST),mips)
-	CPU_ARCH	= mips
-else
-	CPU_ARCH	= x86
-endif
-
-MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-ifdef BUILD_OPT
-	OPTIMIZER	= -O2
-endif
-
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Vgcc_ntox86 -Wall -pipe -DNTO -DHAVE_STRERROR -D_QNX_SOURCE -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=500
-
-ifdef USE_PTHREADS
-	DEFINES		+= -D_REENTRANT
-endif
-
-ARCH			= QNX
-
-DSO_CFLAGS		= -Wc,-fPIC
-DSO_LDOPTS		= -shared
-DSO_LDFLAGS		=

mozilla/security/coreconf/README

@@ -1,560 +0,0 @@
-OVERVIEW of "ns/coreconf":
-
-    This README file is an attempt to provide the reader with a simple
-    synopsis of the "ns/coreconf" build system which was originally
-    fundamentally designed and built to accomodate Netscape's binary
-    release model.  Wherever possible, an attempt has been made to
-    comply with the NSPR 2.0 build system, including mimicing the
-    compiler/linker flags, and directory naming structure.  The reader
-    should keep in mind that the system builds binary releases of
-    header files, class files, libraries, and executables on numerous
-    flavors of UNIX and Windows operating systems.  Unfortunately,
-    no serious attempt has ever been made to incorporate an ability to
-    generate cross-platform binaries on an Apple MacIntosh platform.
-
-    Note that this file will not attempt to redefine or document the
-    architecture of this system.  However, documents on this subject
-    are available at the following URL:
-
-        http://warp/hardcore/prj-ttools/specs/release/index.html
-
-
-
-DEPENDENCIES of "ns/coreconf":
-
-    The "ns/coreconf" build system requires the specified versions of
-    the following platform-dependent tools:
-
-        UNIX Platforms:
-        --------------
-        gmake (version 3.74 or later)
-        perl 4.0 (NOTE:  perl 5.003 or later recommended)
-        uname
-
-        Windows Platforms:
-        -----------------
-        gmake 3.74 (must use hacked Netscape version)
-        shmsdos.exe (contained in Netscape gmake.exe)
-        nsinstall.exe (contained in Netscape gmake.exe)
-        perl.exe (version 4.0 for everything except testing;
-                  NOTE:  MKS toolkit perl 5.002 is broken)
-        perl5.exe (for testing;
-                   NOTE:  perl 5.003 or later recommended;
-                          MKS toolkit perl 5.002 is broken)
-        uname.exe (use nstools version)
-
-ENHANCEMENTS to "ns/coreconf":
-
-    With the advent of Certificate Server 4.0 using the ns/coreconf
-    build system, several changes had to be made to enhance
-    ns/coreconf support for building Java/JNI classes/programs, as
-    well as libraries slated to be released as binaries.  While the
-    following may not represent an exhaustive list of these changes,
-    it does attempt to be at least somewhat comprehensive:
-
-        (1) During the course of these enhancements, a total of
-            four files have been modified, and four new files have
-            been added.
-
-            The following files have been modified:
-
-                - command.mk:    removed old definition of JAR
-
-                - config.mk:     added include statement of new
-                                 "jdk.mk" file
-
-                - ruleset.mk:    allowed the $(MKPROG) variable to be
-                                 overridden by supplying it with a
-                                 default value of $(CC); augmented
-                                 numerous definitions to enhance
-                                 ability of ns/coreconf to produce
-                                 a more robust set of libraries;
-                                 added some JNI definitions; PACKAGE
-                                 definition may be overridden by new
-                                 "jdk.mk" file
-
-                - rules.mk:      separated the compile phase of a
-                                 program from the link phase of a
-                                 program such that a developer can
-                                 now strictly override program linkage
-                                 by simply supplying a $(MKPROG)
-                                 variable; augmented NETLIBDEPTH
-                                 to use CORE_DEPTH but retain backward
-                                 compatibility; added JNI section;
-                                 modified .PRECIOUS rule;
-
-            The following files have been added:
-
-                - README:        this file; an ASCII-based text
-                                 document used to summarize the
-                                 ns/coreconf build system and
-                                 suitable (paginated) for printing
-
-                - jdk.mk:        a file comprising most (if not all)
-                                 of the default Java related build
-                                 information; the definitions in this
-                                 file are only included if NS_USE_JDK
-                                 has been defined
-
-                - jniregen.pl:   a perl script used to create a
-                                 dependency for when JNI files should
-                                 be regenerated (based upon any change
-                                 to the ".class" file from which the
-                                 ".h" file was originally generated)
-
-                - outofdate.pl:  a perl script used to create a
-                                 dependency for when ".class" files
-                                 should be regenerated (based upon
-                                 any change to the ".java" file
-                                 from which the ".class" file was
-                                 originally generated)
-
-        (2) As stated above, the ns/coreconf build system now separates
-            the link phase of a program from its compilation phase.
-            While ns/coreconf still works exactly as it used to because
-            the $(MKPROG) variable is assigned $(CC) by default, a developer
-            may now override this behavior by simply supplying their
-            own unique value for $(MKPROG) on every platform.  This allows
-            a program compiled with $(CC) to link with external libraries
-            that may contain "C++" linkage.  Before this change, a
-            programmer would need to reference their own local copy of
-            rules.mk (see the ns/sectools/cmd/pk12util program for
-            an example of how this used to be accomplished).
-
-        (3) Currently, the ns/coreconf build system differs from the
-            NSPR 2.0 build system which utilizes an "_s" to denote
-            static libraries from import libraries.  In fact, the
-            ns/coreconf build system adds no prefixes or suffixes to
-            distinguish one version of static libraries from another.
-            Note that both the ns/coreconf build system as well as the
-            NSPR 2.0 build system do nothing to provide a method of
-            distinguishing 16-bit from 32-bit static libraries on the
-            same machine, either, since:
-
-                a) this might only provide difficulty during
-                   development, since static libraries always
-                   need to be embedded within a program
-                   (note this is highly unlikely, since libraries
-                    for different platforms are subdivided via
-                    a well-known subdirectory structure, and
-                    a developer may use multiple trees for
-                    development),
-
-                b) this maintains backwards compatibility,
-                   something very important since no legacy
-                   programs will need to change their link phase, and
-
-                c) Netscape as a company has dropped any plans
-                   of future development of 16-bit products.
-
-        (4) Since several members of the Hardcore Security group did
-            not favor NSPR 2.0's solution of adding an "_s" to static
-            libraries on Windows platforms as a method to distinguish
-            them from their import library cousins, a different solution
-            was proposed and has been recently implemented for ns/coreconf:
-
-                - a 16 has been added as a suffix to both dynamic and
-                  import libraries built on 16-bit Windows platforms
-
-                - a 32 has been added as a suffix to both dynamic and
-                  import libraries built on 32-bit Windows platforms
-
-            Since, the HCL release process currently only contains a
-            single instance of building a dynamic library,
-            ns/security/lib/fortcrypt/fort12.dll, the impact of this
-            change should be relatively small.
-
-            It should be noted that although this would additionally
-            limit the 8.3 namespace on 16-bit platforms, it is highly
-            unlikely that any future development will be performed on
-            this platform.
-
-        (5) The $(LIBRARY_VERSION) tag has been added to all non-static
-            libraries created on UNIX operating systems to alleviate
-            any future confusion for binary releases which utilize this
-            tag.  Again, it should be noted that this tag is only
-            utilized on non-static libraries, since more than one
-            version of the library may need to exist simultaneously
-            if multiple products are utilized.
-
-            Currently, only one HCL released library utilizes this tag:
-
-                ns/security/lib/fortcrypt/fort12.a
-                (e. g. - in this library, the tag has been set to '12')
-
-            Again, it should be noted that although this would
-            additionally limit the 8.3 namespace on 16-bit platforms,
-            it is highly unlikely that any future development will be
-            performed on this platform.
-
-        (6) The $(JDK_DEBUG_SUFFIX) extension has been added to all
-            library and program names to support debug versions of
-            Java programs (e. g. - java_g, javac_g, etc).
-
-            Once again, it should be noted that although this would
-            additionally limit the 8.3 namespace on 16-bit platforms,
-            it is highly unlikely that any future Java development
-            will be performed on this platform.
-
-        (7) Most (if not all) default definitions for java have been
-            encapsulated within their own file, jdk.mk, which is
-            always included by default in ns/coreconf/config.mk.
-            However, the definitions within this file are only ever
-            activated if NS_USE_JDK has been set to be 1.
-
-
-        (8) Two perl scripts (jniregen.pl and outofdate.pl) have been
-            added to the system to foster a more robust development
-            environment for composing Java and JNI programs
-            utilizing the ns/coreconf build system.  Both of these
-            perl scripts are related to resolving dependencies which
-            can not be accomplished through normal makefile dependencies.
-
-        (9) This file, README, was created in an attempt to allow
-            developers who have familiarity with ns/coreconf a simple
-            roadmap for what has changed, as well as a top-level view of
-            what comprises ns/coreconf.  This file was written in
-            ASCII (rather than HTML) primarily to promote simple
-            paginated printing.
-
-OVERVIEW of "config.mk":
-
-    This file contains the configuration information necessary to
-    build each "Core Components" source module:
-
-        include file name       Purpose
-        ===================     =======================================
-        arch.mk                 source and release <architecture> tags
-
-        command.mk              default command macros 
-				(NOTE: may be overridden in $(OS_CONFIG).mk)
-
-        $(OS_CONFIG).mk         <architecture>-specific macros
-                                (dependent upon <architecture> tags)
-
-        tree.mk                 release <tree> tags 
-				(dependent upon <architecture> tags)
-
-        module.mk               source and release <component> tags 
-				(NOTE:  A component is also called a module 
-				or a subsystem.  This file is dependent upon
-                                $(MODULE) being defined on the command
-                                line, as an environment variable, or in
-                                individual makefiles, or more
-                                appropriately, manifest.mn)
-
-        version.mk              release <version> tags 
-				(dependent upon $(MODULE) being defined on 
-				the command line, as an environment variable, 
-				or in individual makefiles, or more
-                                appropriately, manifest.mn)
-
-        location.mk             macros to figure out binary code location
-                                (dependent upon <platform> tags)
-
-        source.mk               <component>-specific source path
-                                (dependent upon <user_source_tree>,
-                                <source_component>, <version>, and
-                                <platform> tags)
-
-        headers.mk              include switch for support header files 
-				(dependent upon <tree>, <component>, <version>,
-                                and <platform> tags)
-
-        prefix.mk               compute program prefixes
-
-        suffix.mk               compute program suffixes 
-				(dependent upon <architecture> tags)
-
-        jdk.mk                  define JDK 
-				(dependent upon <architecture>,
-                                <source>, and <suffix> tags)
-
-        ruleset.mk              Master "Core Components" rule set
-                                (should always be the last file
-                                included by config.mk)
-
-
-
-OVERVIEW of "rules.mk":
-
-    The "rules.mk" file consists of four sections.  The first section
-    contains the "master" build rules for all binary releases.  While
-    this section can (and should) largely be thought of as "language"
-    independent, it does utilize the "perl" scripting language to
-    perform both the "import" and "release" of binary modules.
-
-    The rules which dwell in this section and their purpose:
-
-
-        CATEGORY/rule::         Purpose
-        ===================     =======================================
-
-        GENERAL
-        -------
-        all::                   "default" all-encompassing rule which
-                                performs "export libs program install"
-
-        export::                recursively copy specified
-                                cross-platform header files to the
-                                $(SOURCE_XPHEADERS_DIR) directory;
-                                recursively copy specified
-                                machine-dependent header files to the
-                                $(SOURCE_MDHEADERS_DIR) directory;
-                                although all rules can be written to
-                                repetively "chain" into other sections,
-                                this rule is the most commonly used
-                                rule to "chain" into other sections
-                                such as Java providing a simple
-                                mechanism which allows no need for
-                                developers to memorize specialized
-                                rules
-
-        libs::                  recursively build
-                                static (archival) $(LIBRARY), shared
-                                (dynamic link) $(SHARED_LIBRARY),
-                                and/or import $(IMPORT_LIBRARY)
-                                libraries
-
-        program::               recursively build $(PROGRAM)
-                                executable
-
-        install::               recursively copy all libraries to
-                                $(SOURCE_LIB_DIR) directory;
-                                recursively copy all executables to
-                                $(SOURCE_BIN_DIR) directory
-
-        clean::                 remove all files specified in the
-                                $(ALL_TRASH) variable
-
-        clobber::               synonym for "clean::" rule
-
-        realclean::             remove all files specified by
-                                $(wildcard *.OBJ), dist, and in
-                                the $(ALL_TRASH) variable
-
-        clobber_all::           synonym for "realclean::" rule
-
-        private_export::        recursively copy specified
-                                cross-platform header files to the
-                                $(SOURCE_XPPRIVATE_DIR) directory
-
-
-        IMPORT
-        ------
-        import::                uses perl script to retrieve specified
-                                VERSION of the binary release from
-                                $(RELEASE_TREE)
-
-        RELEASE
-        -------
-        release_clean::         remove all files from the
-                                $(SOURCE_RELEASE_PREFIX) directory
-
-        release::               place specified VERSION of the
-                                binary release in the appropriate
-                                $(RELEASE_TREE) directory
-
-        release_export::        recursively copy specified
-                                cross-platform header files to the
-                                $(SOURCE_XPHEADERS_DIR)/include
-                                directory
-
-        release_md::            recursively copy all libraries to
-                                $(SOURCE_RELEASE_PREFIX)/
-                                $(SOURCE_RELEASE_LIB_DIR) directory;
-                                recursively copy all executables to
-                                $(SOURCE_RELEASE_PREFIX)/
-                                $(SOURCE_RELEASE_BIN_DIR) directory
-
-        release_jars::          use perl script to package appropriate
-                                files in the $(XPCLASS_JAR),
-                                $(XPHEADER_JAR), $(MDHEADER_JAR), and
-                                $(MDBINARY_JAR) jar files
-
-        release_cpdistdir::     use perl script to copy the
-                                $(XPCLASS_JAR), $(XPHEADER_JAR),
-                                $(MDHEADER_JAR), and $(MDBINARY_JAR)
-                                jar files to the specified VERSION
-                                of the $(RELEASE_TREE) directory
-
-
-
-        TOOLS and AUTOMATION
-        --------------------
-        platform::              tool used to display the platform name
-                                as composed within the "arch.mk" file
-
-        autobuild::             automation rule used by "Bonsai" and
-                                "Tinderbox" to automatically generate
-                                binary releases on various platforms
-
-        tests::                 automation tool used to run the
-                                "regress" and "reporter" tools 
-                                on various regression test suites
-
-    The second section of "rules.mk" primarily contains several
-    "language" dependent build rules for binary releases.  These are
-    generally "computed" rules (created on the "fly"), and include
-    rules used by "C", "C++", assembly, the preprocessor, perl, and
-    the shell.
-
-    The rules which dwell in this section and their purpose:
-
-
-        CATEGORY/rule::                   Purpose
-        ===================               =============================
-
-        LIBRARIES
-        ---------
-        $(LIBRARY):                       build the static library
-                                          specified by the $(LIBRARY)
-                                          variable
-
-        $(IMPORT_LIBRARY):                build the import library
-                                          specified by the
-                                          $(IMPORT_LIBRARY) variable
-
-        $(SHARED_LIBRARY):                build the shared
-                                          (dynamic link) library
-                                          specified by the
-                                          $(SHARED_LIBRARY) variable
-
-
-        PROGRAMS
-        --------
-        $(PROGRAM):                       build the binary executable
-                                          specified by the $(PROGRAM)
-                                          rule
-
-        $(OBJDIR)/
-        $(PROG_PREFIX)%.pure:             build the "purified" binary
-                                          executable specified by this
-                                          rule
-
-
-        OBJECTS
-        -------
-        $(OBJDIR)/
-        $(PROG_PREFIX)%$(OBJ_SUFFIX):     build the object file
-                                          associated with the
-                                          makefile rule dependency:
-
-                                              %.c   = C file
-                                              %.cpp = C++ file
-                                              %.cc  = C++ file
-                                              %.s   = assembly file
-                                              %.S   = assembly file
-
-        $(OBJDIR)/
-        $(PROG_PREFIX)%:                  (NOTE: deprecated rule)
-                                          build the object file
-                                          associated with the
-                                          makefile rule dependency:
-
-                                              %.cpp = C++ file
-
-        MISCELLANEOUS
-        -------------
-        $(DIRS)::                         specifies a helper method
-                                          used by $(LOOP_THROUGH_DIRS)
-                                          to recursively change
-                                          directories and invoke
-                                          $(MAKE)
-
-        %.i:                              build the preprocessor file
-                                          associated with the
-                                          makefile rule dependency:
-
-                                              %.c   = C file
-                                              %.cpp = C++ file
-
-        %:                                process the specified file
-                                          using the method associated
-                                          with the makefile rule
-                                          dependency:
-
-                                              %.pl = perl script
-                                              %.sh = shell script
-
-        alltags:                          tool used to recursively
-                                          create a "ctags"-style
-                                          file for reference
-
-    The third section of "rules.mk' primarily contains several JAVA
-    "language" build rules for binary releases.  These are also
-    generally "computed" rules (created on the "fly").
-
-    The rules which dwell in this section and their purpose:
-
-
-        CATEGORY/rule::                   Purpose
-        ===================               =============================
-        $(JAVA_DESTPATH)::                create directory specified
-                                          as the Java destination path
-                                          for where classes are
-                                          deposited
-
-        $(JAVA_DESTPATH)/$(PACKAGE)::     create directories specified
-                                          within the $(PACKAGE)
-                                          variable
-
-        $(JMCSRCDIR)::                    create directory specified
-                                          as the JMC destination path
-
-        $(JRI_HEADER_CFILES):             used to generate/regenerate
-                                          JRI header files for "C"
-
-        $(JRI_STUB_CFILES):               used to generate/regenerate
-                                          JRI stub files for "C"
-
-        $(JNI_HEADERS):                   used to generate/regenerate
-                                          JNI header files for "C"
-
-    The fourth section of "rules.mk" primarily contains miscellaneous
-    build rules for binary releases.  Many of these rules are here to
-    create new subdirectories, manage dependencies, and/or override
-    standard gmake "Makefile" rules.
-
-    The rules which dwell in this section and their purpose:
-
-
-        CATEGORY/rule::                   Purpose
-        ===================               =============================
-
-        $(PUBLIC_EXPORT_DIR)::            create directory used to
-                                          house public "C" header files
-
-        $(PRIVATE_EXPORT_DIR)::           create directory used to
-                                          house private "C" header
-                                          files
-
-        $(SOURCE_XP_DIR)/
-        release/include::                 create directory used to
-                                          house "C" header files
-                                          contained in a release
-
-        $(MKDEPENDENCIES)::               for UNIX systems, create
-                                          a directory used to house
-                                          dependencies and utilize
-                                          the $(MKDEPEND) rule to
-                                          create them
-
-        $(MKDEPEND)::                     cd to the dependency
-                                          directory and create them
-
-        depend::                          if $(OBJS) exist, perform the
-                                          $(MKDEPEND) rule followed by
-                                          the $(MKDEPENDENCIES) rule
-
-        dependclean::                     remove all files contained
-                                          in the dependency repository
-
-        .DEFAULT:                         standard gmake rule
-
-        .SUFFIXES:                        standard gmake rule
-
-        .PRECIOUS:                        standard gmake rule
-
-        .PHONY:                           standard gmake rule
-

mozilla/security/coreconf/ReliantUNIX.mk

@@ -1,88 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for ReliantUNIX
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-ifdef NS_USE_GCC
-	## gcc-2.7.2 homebrewn
-	CC          = gcc
-	CCC         = g++
-	AS          = $(CC)
-	ASFLAGS     += -x assembler-with-cpp
-	LD          = gld
-	ODD_CFLAGS  = -pipe -Wall -Wno-format
-	ifdef BUILD_OPT
-		OPTIMIZER += -O6
-	endif
-	MKSHLIB     = $(LD)
-	MKSHLIB    += -G -h $(@:$(OBJDIR)/%.so=%.so)
-	DSO_LDOPTS += -G -Xlinker -Blargedynsym
-else
-	## native compiler (CDS++ 1.0)
-#	CC   = /usr/bin/cc
-	CC   = cc
-	CCC  = /usr/bin/CC
-	AS   = /usr/bin/cc
-	ODD_CFLAGS  = 
-	ifdef BUILD_OPT
-		OPTIMIZER += -O -F Olimit,4000
-	endif
-	MKSHLIB     = $(CC)
-	MKSHLIB    += -G -h $(@:$(OBJDIR)/%.so=%.so)
-	DSO_LDOPTS += -G -W l,-Blargedynsym
-endif
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-NOSUCHFILE  = /sni-rm-f-sucks
-ODD_CFLAGS += -DSVR4 -DSNI -DRELIANTUNIX
-CPU_ARCH    = mips
-RANLIB      = /bin/true
-
-# For purify
-NOMD_OS_CFLAGS += $(ODD_CFLAGS)
-
-# we do not have -MDupdate ...
-OS_CFLAGS   += $(NOMD_OS_CFLAGS)
-OS_LIBS     += -lsocket -lnsl -lresolv -lgen -ldl -lc /usr/ucblib/libucb.a
-
-ifdef DSO_BACKEND
-	DSO_LDOPTS += -h $(DSO_NAME)
-endif

mozilla/security/coreconf/ReliantUNIX5.4.mk

@@ -1,35 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for ReliantUNIX5.4
-#
-include $(CORE_DEPTH)/coreconf/ReliantUNIX.mk

mozilla/security/coreconf/SCOOS5.0.mk

@@ -1,36 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SCO OpenServer 5.0 for x86.
-#
-
-include $(CORE_DEPTH)/coreconf/SCO_SV3.2.mk

mozilla/security/coreconf/SCO_SV3.2.mk

@@ -1,91 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SCO Unix for x86.
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-CC         = cc
-OS_CFLAGS += -b elf -KPIC
-CCC        = g++
-CCC       += -b elf -DPRFSTREAMS_BROKEN -I/usr/local/lib/g++-include
-# CCC      = $(CORE_DEPTH)/build/hcpp
-# CCC     += +.cpp +w
-RANLIB     = /bin/true
-
-#
-# -DSCO_PM - Policy Manager AKA: SCO Licensing
-# -DSCO - Changes to Netscape source (consistent with AIX, LINUX, etc..)
-# -Dsco - Needed for /usr/include/X11/*
-#
-OS_CFLAGS   += -DSCO_SV -DSYSV -D_SVID3 -DHAVE_STRERROR -DSW_THREADS -DSCO_PM -DSCO -Dsco
-#OS_LIBS     += -lpmapi -lsocket -lc
-MKSHLIB      = $(LD)
-MKSHLIB     += $(DSO_LDOPTS)
-XINC         = /usr/include/X11
-MOTIFLIB    += -lXm
-INCLUDES    += -I$(XINC)
-CPU_ARCH     = x86
-GFX_ARCH     = x
-ARCH         = sco
-LOCALE_MAP   = $(CORE_DEPTH)/cmd/xfe/intl/sco.lm
-EN_LOCALE    = C
-DE_LOCALE    = de_DE.ISO8859-1
-FR_LOCALE    = fr_FR.ISO8859-1
-JP_LOCALE    = ja
-SJIS_LOCALE  = ja_JP.SJIS
-KR_LOCALE    = ko_KR.EUC
-CN_LOCALE    = zh
-TW_LOCALE    = zh
-I2_LOCALE    = i2
-LOC_LIB_DIR  = /usr/lib/X11
-NOSUCHFILE   = /solaris-rm-f-sucks
-BSDECHO      = /bin/echo
-ifdef MAPFILE
-# Add LD options to restrict exported symbols to those in the map file
-endif
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-
-#
-# These defines are for building unix plugins
-#
-BUILD_UNIX_PLUGINS  = 1
-#DSO_LDOPTS         += -b elf -G -z defs
-DSO_LDOPTS         += -b elf -G
-DSO_LDFLAGS        += -nostdlib -L/lib -L/usr/lib -lXm -lXt -lX11 -lgen
-
-# Used for Java compiler
-EXPORT_FLAGS += -W l,-Bexport

mozilla/security/coreconf/SunOS4.1.3_U1.mk

@@ -1,58 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS4.1
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-INCLUDES += -I/usr/dt/include -I/usr/openwin/include -I/home/motif/usr/include
-
-# SunOS 4 _requires_ that shared libs have a version number.
-# XXX FIXME: Version number should use NSPR_VERSION_NUMBER?
-DLL_SUFFIX = so.1.0
-CC         = gcc
-RANLIB     = ranlib
-CPU_ARCH   = sparc
-
-# Purify doesn't like -MDupdate
-NOMD_OS_CFLAGS += -Wall -Wno-format -DSUNOS4
-OS_CFLAGS      += $(DSO_CFLAGS) $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES)
-MKSHLIB         = $(LD)
-MKSHLIB        += $(DSO_LDOPTS)
-NOSUCHFILE      = /solaris-rm-f-sucks
-DSO_LDOPTS      =
-
-# -fPIC generates position-independent code for use in a shared library.
-DSO_CFLAGS += -fPIC

mozilla/security/coreconf/SunOS5.10.mk

@@ -1,44 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS5.10
-#
-
-SOL_CFLAGS += -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-ifeq ($(OS_RELEASE),5.10)
-	OS_DEFINES += -DSOLARIS2_10
-endif
-
-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc 

mozilla/security/coreconf/SunOS5.10_i86pc.mk

@@ -1,48 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Solaris 10 on x86
-# 
-
-SOL_CFLAGS	= -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-CPU_ARCH		= x86
-ARCHFLAG		=
-OS_DEFINES		+= -Di386
-
-ifeq ($(OS_RELEASE),5.10_i86pc)
-	OS_DEFINES += -DSOLARIS2_10
-endif
-
-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc

mozilla/security/coreconf/SunOS5.3.mk

@@ -1,38 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS5.3
-#
-
-SOL_CFLAGS =
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk

mozilla/security/coreconf/SunOS5.4.mk

@@ -1,38 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS5.4
-#
-
-SOL_CFLAGS =
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk

mozilla/security/coreconf/SunOS5.4_i86pc.mk

@@ -1,67 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Solaris 2.4 on x86
-#
-
-include $(CORE_DEPTH)/coreconf/UNIX.mk
-
-DEFAULT_COMPILER = cc
-
-ifdef NS_USE_GCC
-	CC		= gcc
-	OS_CFLAGS	+= -Wall -Wno-format
-	CCC		= g++
-	CCC		+= -Wall -Wno-format
-	ASFLAGS		+= -x assembler-with-cpp
-	OS_CFLAGS	+= $(NOMD_OS_CFLAGS)
-	ifdef USE_MDUPDATE
-		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
-	endif
-else
-	CC		= cc
-	CCC		= CC
-	ASFLAGS		+= -Wa,-P
-	OS_CFLAGS	+= $(NOMD_OS_CFLAGS)
-endif
-
-CPU_ARCH	= x86
-
-MKSHLIB		= $(LD)
-MKSHLIB		+= $(DSO_LDOPTS)
-NOSUCHFILE	= /solx86-rm-f-sucks
-RANLIB		= echo
-
-# for purify
-NOMD_OS_CFLAGS	+= -DSVR4 -DSYSV -D_REENTRANT -DSOLARIS -D__svr4__ -Di386
-
-DSO_LDOPTS	+= -G

mozilla/security/coreconf/SunOS5.5.1.mk

@@ -1,44 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS5.5.1
-#
-
-SOL_CFLAGS += -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-ifeq ($(OS_RELEASE),5.5.1)
-	OS_DEFINES += -DSOLARIS2_5
-endif
-
-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc 

mozilla/security/coreconf/SunOS5.5.1_i86pc.mk

@@ -1,46 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Solaris 2.5.1 on x86
-# 
-
-SOL_CFLAGS	= -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-CPU_ARCH		= x86
-ARCHFLAG		=
-OS_DEFINES		+= -Di386
-
-ifeq ($(OS_RELEASE),5.5.1_i86pc)
-	OS_DEFINES += -DSOLARIS2_5
-endif

mozilla/security/coreconf/SunOS5.5.mk

@@ -1,42 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS5.5
-#
-
-SOL_CFLAGS += -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-ifeq ($(OS_RELEASE),5.5)
-	OS_DEFINES += -DSOLARIS2_5
-endif

mozilla/security/coreconf/SunOS5.6.mk

@@ -1,44 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS5.6
-#
-
-SOL_CFLAGS += -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-ifeq ($(OS_RELEASE),5.6)
-	OS_DEFINES += -DSOLARIS2_6
-endif
-
-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc 

mozilla/security/coreconf/SunOS5.6_i86pc.mk

@@ -1,46 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for Solaris 2.6 on x86
-# 
-
-SOL_CFLAGS	= -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-CPU_ARCH		= x86
-ARCHFLAG		=
-OS_DEFINES		+= -Di386
-
-ifeq ($(OS_RELEASE),5.6_i86pc)
-	OS_DEFINES += -DSOLARIS2_6
-endif

mozilla/security/coreconf/SunOS5.7.mk

@@ -1,44 +0,0 @@
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-# 
-# 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 the Netscape security libraries.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-# Config stuff for SunOS5.7
-#
-
-SOL_CFLAGS += -D_SVID_GETTOD
-
-include $(CORE_DEPTH)/coreconf/SunOS5.mk
-
-ifeq ($(OS_RELEASE),5.7)
-	OS_DEFINES += -DSOLARIS2_7
-endif
-
-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc