(eog_hig_dialog_new): add terminating NULL in g_object_set.

[evince.git] / pdf / xpdf / PBMOutputDev.h

diff --git a/pdf/xpdf/PBMOutputDev.h b/pdf/xpdf/PBMOutputDev.h
index 5afe0d688b5c232dd3f7eeae4fed9db2fe408a45..9d1539dfe69c58e11ef1e65bc4eef0895dd54c59 100644 (file)
--- a/pdf/xpdf/PBMOutputDev.h
+++ b/pdf/xpdf/PBMOutputDev.h
@@ -2,14 +2,16 @@
 //
 // PBMOutputDev.h
 //
 //
 // PBMOutputDev.h
 //

-// Copyright 1998 Derek B. Noonburg
+// Copyright 1998-2003 Glyph & Cog, LLC

 //
 //========================================================================
 
 #ifndef PBMOUTPUTDEV_H
 #define PBMOUTPUTDEV_H
 
 //
 //========================================================================
 
 #ifndef PBMOUTPUTDEV_H
 #define PBMOUTPUTDEV_H
 

-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -27,7 +29,7 @@ public:
   // constraints in the underlying XOutputDev object.)
 
   static PBMOutputDev *makePBMOutputDev(char *displayName,
   // constraints in the underlying XOutputDev object.)
 
   static PBMOutputDev *makePBMOutputDev(char *displayName,

-                                       char *fileRoot1);
+                                       char *fileRootA);

 
   static void killPBMOutputDev(PBMOutputDev *out);
 
 
   static void killPBMOutputDev(PBMOutputDev *out);
 


@@ -43,9 +45,9 @@ public:
 
 private:
 
 
 private:
 

-  PBMOutputDev(Display *display1, int screen1,
-              Pixmap pixmap1, Window dummyWin1,
-              int invert1, char *fileRoot1);
+  PBMOutputDev(Display *displayA, int screenA,
+              Pixmap pixmapA, Window dummyWinA,
+              int invertA, char *fileRootA);

 
   char *fileRoot;
   char *fileName;
 
   char *fileRoot;
   char *fileName;