Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# 37239

Browse Source 
r= dcone
OS/2 bring up continues - PR_CALLBACK and typo


git-svn-id: svn://10.0.0.236/trunk@69465 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2000-05-12 22:21:42 +00:00
parent 030bce7a4a
commit e802e063b8
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/gfx/src/nsDeviceContext.cpp
View File

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "nsDeviceContext.h"
@ -73,13 +79,12 @@ DeviceContextImpl :: DeviceContextImpl()
mColorSpace = nsnull;
}
static PRBool DeleteValue(nsHashKey* aKey, void* aValue, void* closure)
static PRBool PR_CALLBACK DeleteValue(nsHashKey* aKey, void* aValue, void* closure)
{
delete ((nsString*)aValue);
return PR_TRUE;
}
DeviceContextImpl :: ~DeviceContextImpl()
{
if (nsnull != mFontCache)
@ -749,7 +754,7 @@ nsresult nsFontCache :: Flush()
return NS_OK;
}
#ifdef XP_PC
#if defined(XP_PC) && !defined(XP_OS2)
// XXX I had to add this because I changed the link order on Windows
void notCalled()
{

14
mozilla/gfx/src/ps/nsPostScriptObj.cpp
View File

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "nscore.h"
@ -73,7 +79,11 @@ nsPostScriptObj::~nsPostScriptObj()
if ( mPrintSetup->filename != (char *) NULL )
fclose( mPrintSetup->out );
else
#ifdef XP_OS2_VACPP
// pclose not defined OS2TODO
#else
pclose( mPrintSetup->out );
#endif
#ifdef VMS
if ( mPrintSetup->print_cmd != (char *) NULL ) {
char VMSPrintCommand[1024];
@ -145,7 +155,11 @@ printf( "top %f bottom %f left %f right %f\n", top, bottom, left, right );
if ( isAPrinter == PR_TRUE ) {
#ifndef VMS
aSpec->GetCommand( &buf );
#ifdef XP_OS2_VACPP
// popen not defined OS2TODO
#else
mPrintSetup->out = popen( buf, "w" );
#endif
mPrintSetup->filename = (char *) NULL;
#else
// We can not open a pipe and print the contents of it. Instead