--- psiconv/trunk/lib/psiconv/parse_simple.c	2000/12/15 00:21:51	64
+++ psiconv/trunk/lib/psiconv/parse_simple.c	2000/12/25 22:25:33	79
@@ -18,15 +18,18 @@
 */
 
 #include "config.h"
+#include "compat.h"
+
 #include <stdlib.h>
 
 #include "parse_routines.h"
+#include "error.h"
 
 psiconv_u8 psiconv_read_u8(const psiconv_buffer buf,int lev,psiconv_u32 off,
                            int *status)
 {
   psiconv_u8 *ptr;
-  ptr = psiconv_list_get(buf,off);
+  ptr = psiconv_buffer_get(buf,off);
   if (!ptr) {
     psiconv_warn(lev,off,"Trying byte read past the end of the file");
     if (status)
@@ -42,8 +45,8 @@
                              int *status)
 {
   psiconv_u8 *ptr0,*ptr1;
-  ptr0 = psiconv_list_get(buf,off);
-  ptr1 = psiconv_list_get(buf,off+1);
+  ptr0 = psiconv_buffer_get(buf,off);
+  ptr1 = psiconv_buffer_get(buf,off+1);
   if (!ptr0 || !ptr1) {
     psiconv_warn(lev,off,"Trying word read past the end of the file");
     if (status)
@@ -59,10 +62,10 @@
                              int *status)
 {
   psiconv_u8 *ptr0,*ptr1,*ptr2,*ptr3;
-  ptr0 = psiconv_list_get(buf,off);
-  ptr1 = psiconv_list_get(buf,off+1);
-  ptr2 = psiconv_list_get(buf,off+2);
-  ptr3 = psiconv_list_get(buf,off+3);
+  ptr0 = psiconv_buffer_get(buf,off);
+  ptr1 = psiconv_buffer_get(buf,off+1);
+  ptr2 = psiconv_buffer_get(buf,off+2);
+  ptr3 = psiconv_buffer_get(buf,off+3);
   if (!ptr0 || !ptr1 || !ptr2 || !ptr3) {
     psiconv_warn(lev,off,"Trying long read past the end of the file");
     if (status)