#188249

r=me, sr=blizzard (platform specific)
Start landing GCC support for OS/2 - mainly cleanup to start

gfx/src/os2/Makefile.in

@@ -78,13 +78,13 @@ EXTRA_DSO_LDOPTS = \
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 OS_LIBS += libconv.lib
 else
-OS_LIBS += -luconv
+OS_LIBS += -luconv -los2386
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(topsrcdir)/gfx/src -I$(topsrcdir)/gfx/src/shared
 
-OS_LIBS		+= $(NSPR_LIBS)
-
-$(SHARED_LIBRARY): $(OBJS)
+ifeq ($(MOZ_OS2_TOOLS),EMX)
+DEFINES += -DUSE_OS2_TOOLKIT_HEADERS
+endif

gfx/src/os2/nsDeviceContextOS2.cpp

@@ -772,7 +772,14 @@ nsresult nsDeviceContextOS2::PrepareDocument(PRUnichar * aTitle, PRUnichar* aPri
     titleStr = aTitle;
     char *title = GetACPString(titleStr);
 
-    PSZ pszDocName = title != nsnull?title:"Mozilla Document";
+    PSZ pszDocName;
+    const PSZ pszGenericDocName = "MozillaDocument";
+
+    if (title) {
+      pszDocName = title;
+    } else {
+      pszDocName = pszGenericDocName;
+    } 
 
     long lDummy = 0;
     long lResult = ::DevEscape(mPrintDC, DEVESC_STARTDOC,

gfx/src/os2/nsDeviceContextSpecOS2.cpp

@@ -698,10 +698,10 @@ int PRINTDLG::GetDefaultPrinter ()
    return mDefaultQueue;
 }
 
-PRINTDLG::GetPrinter (int numPrinter, char** printerName)
+void PRINTDLG::GetPrinter (int numPrinter, char** printerName)
 {
    if (numPrinter > mQueueCount)
-      return NULL;
+      return;
  
    nsCAutoString pName(mPQBuf [numPrinter]->QueueName());
  
@@ -790,7 +790,7 @@ BOOL PRINTDLG::ShowProperties (int index)
     if (buflen != mPQBuf[Ind]->PQI3().pDriverData->cb)
     {
         if (DosAllocMem((PPVOID)&pNewDrivData,buflen,fALLOC))
-            return(DPDM_ERROR);
+            return(FALSE); // DPDM_ERROR
     
 /* copy over old data so driver can use old job */
 /* properties as base for job properties dialog */

gfx/src/os2/nsDeviceContextSpecOS2.h

@@ -81,7 +81,7 @@ public:
   ~PRINTDLG ();
    int GetNumPrinters ();
    int GetDefaultPrinter ();
-   GetPrinter (int numPrinter, char** printerName);
+   void GetPrinter (int numPrinter, char** printerName);
    PRTQUEUE* SetPrinterQueue (int numPrinter);
    HDC GetDCHandle (int numPrinter);
    PLONG GetPrintDriverSize (int printer);

gfx/src/os2/nsOS2Uni.h

@@ -41,6 +41,9 @@
 #include <uconv.h>
 #include "nsHashTable.h"
 
+#ifdef XP_OS2_EMX
+#include <ulserr.h>
+#endif
 
 class OS2Uni {
 public: