Commit 80e1b303 authored by seawood%netscape.com's avatar seawood%netscape.com
Browse files

Purge XP_PC. 

Bug #56767 r=mkaply sr=alecf
parent 5c300814

content/base/src/nsPrintEngine.cpp

+5 −5
Original line number Diff line number Diff line
@@ -573,11 +573,11 @@ nsPrintEngine::Print(nsIPrintSettings* aPrintSettings, 
  // need for capturing result on each doc and sub-doc that is printed

  gDumpFileNameCnt   = 0;

  gDumpLOFileNameCnt = 0;

#if defined(XP_PC)

#if defined(XP_WIN) || defined(XP_OS2)

  if (kPrintingLogMod && kPrintingLogMod->level == DUMP_LAYOUT_LEVEL) {

    RemoveFilesInDir(".\\");

  }

#endif // XP_PC

#endif // XP_WIN || XP_OS2

#endif // EXTENDED_DEBUG_PRINTING



  nsresult rv = NS_ERROR_FAILURE;
@@ -1043,7 +1043,7 @@ nsPrintEngine::PrintPreview(nsIPrintSettings* aPrintSettings, 
    return NS_ERROR_FAILURE;

  }



#if defined(XP_PC) && defined(EXTENDED_DEBUG_PRINTING)

#if (defined(XP_WIN) || defined(XP_OS2)) && defined(EXTENDED_DEBUG_PRINTING)

  if (!mIsDoingPrintPreview) {

    if (kPrintingLogMod && kPrintingLogMod->level == DUMP_LAYOUT_LEVEL) {

      RemoveFilesInDir(".\\");
@@ -2427,7 +2427,7 @@ nsPrintEngine::SetupToPrintContent(nsIDeviceContext* aDContext, 
        po->DestroyPresentation();

      }



#if defined(XP_PC) && defined(EXTENDED_DEBUG_PRINTING)

#if (defined(XP_WIN) || defined(XP_OS2)) && defined(EXTENDED_DEBUG_PRINTING)

      // We need to clear all the output files here

      // because they will be re-created with second reflow of the docs

      if (kPrintingLogMod && kPrintingLogMod->level == DUMP_LAYOUT_LEVEL) {
@@ -4694,7 +4694,7 @@ nsPrintEngine::FirePrintCompletionEvent() 
//-- Debug helper routines

//---------------------------------------------------------------

//---------------------------------------------------------------

#if defined(XP_PC) && defined(EXTENDED_DEBUG_PRINTING)

#if (defined(XP_WIN) || defined(XP_OS2)) && defined(EXTENDED_DEBUG_PRINTING)

#include "windows.h"

#include "process.h"

#include "direct.h"

content/html/content/src/nsHTMLAppletElement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 


// XXX this is to get around conflicts with windows.h defines

// introduced through jni.h

#ifdef XP_PC

#ifdef XP_WIN

#undef GetClassName

#undef GetObject

#endif

content/html/document/src/nsHTMLDocument.cpp

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ nsHTMLDocument::RetrieveRelevantHeaders(nsIChannel *aChannel) 
        // non-y2k with msvc; '%#c' requests that a full year be used in the

        // result string.  Other OSes just use "%c".

        PR_FormatTime(buf, sizeof buf,

#if defined(XP_PC) && !defined(XP_OS2)

#ifdef XP_WIN

                      "%#c",

#else

                      "%c",

content/xul/content/src/nsXULPopupListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 


// on win32 and os/2, context menus come up on mouse up. On other platforms,

// they appear on mouse down. Certain bits of code care about this difference.

#ifndef XP_PC

#if !defined(XP_WIN) && !defined(XP_OS2)

#define NS_CONTEXT_MENU_IS_MOUSEUP 1

#endif

docshell/base/nsDefaultURIFixup.cpp

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ nsDefaultURIFixup::CreateFixupURI(const nsAString& aStringURI, PRUint32 aFixupFl 
        if(*aURI)

            return NS_OK;



#ifdef XP_PC

#if defined(XP_WIN) || defined(XP_OS2)

        // Not a file URL, so translate '\' to '/' for convenience in the common protocols

        // e.g. catch

        //
@@ -414,7 +414,7 @@ nsresult nsDefaultURIFixup::ConvertFileToStringURI(const nsAString& aIn, 
{

    PRBool attemptFixup = PR_FALSE;



#ifdef XP_PC

#if defined(XP_WIN) || defined(XP_OS2)

    // Check for \ in the url-string or just a drive (PC)

    if(kNotFound != aIn.FindChar(PRUnichar('\\')) || ((aIn.Length() == 2 ) && (aIn.Last() == PRUnichar(':') || aIn.Last() == PRUnichar('|'))))

    {