Adopt use of gnulib for portability.

[pspp] / src / devind.c

diff --git a/src/devind.c b/src/devind.c
index ad0cbeae0437389a821b6db03efdf9b9f0f82121..39f0550e5aba217565f5b0daeeb80b2a7e6ab32b 100644 (file)
--- a/src/devind.c
+++ b/src/devind.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 /* Device-independent output format.  Eventually I intend for all
    PSPP output to work this way, but adding it as an available
@@ -101,12 +101,15 @@
 #include "alloc.h"
 #include "error.h"
 #include "filename.h"
-#include "getline.h"
+#include "getl.h"
 #include "output.h"
 #include "som.h"
 #include "tab.h"
 #include "version.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 /* Device-independent output driver extension record. */
 struct devind_driver_ext
   {
@@ -260,7 +263,7 @@ devind_close_page (struct outp_driver *this)
 static void output_tab_table (struct outp_driver *, struct tab_table *);
 
 static void
-devind_submit (struct outp_driver *this, struct som_table *s)
+devind_submit (struct outp_driver *this, struct som_entity *s)
 {
   extern struct som_table_class tab_table_class;
   struct devind_driver_ext *x = this->ext;
@@ -272,10 +275,10 @@ devind_submit (struct outp_driver *this, struct som_table *s)
       return;
     }
 
-  if (s->class == &tab_table_class)
+  assert (s->class == &tab_table_class);
+
+  if ( s->type == SOM_TABLE ) 
     output_tab_table (this, s->ext);
-  else
-    assert (0);
 }
 
 /* Write string S of length LEN to file F, escaping characters as
@@ -367,7 +370,7 @@ output_tab_table (struct outp_driver *this, struct tab_table *t)
        
        for (c = 0; c < t->nc; c++, ct++)
          {
-            struct len_string *cc;
+            struct fixed_string *cc;
             struct tab_joined_cell *j;
 
             if (*ct == TAB_EMPTY)
@@ -474,4 +477,7 @@ struct outp_class devind_class =
   NULL,
   NULL,
   NULL,
+
+  NULL,
+  NULL,
 };