Index: configure.in
===================================================================
RCS file: /cvs/gnome/gedit/configure.in,v
retrieving revision 1.219
diff -u -u -r1.219 configure.in
--- configure.in	18 Sep 2003 18:44:17 -0000	1.219
+++ configure.in	9 Oct 2003 19:34:06 -0000
@@ -67,6 +67,11 @@
 AC_SUBST(LDFLAGS)
 
 dnl
+dnl Check if lockf is declared
+dnl
+AC_CHECK_DECLS(lockf)
+
+dnl
 dnl Start of pkg-config checks
 dnl
 PKG_CHECK_MODULES(GEDIT, libgnomeui-2.0 >= 2.3.6 libglade-2.0 >= 2.0.0
Index: gedit/gedit-document.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-document.c,v
retrieving revision 1.76
diff -u -u -r1.76 gedit-document.c
--- gedit/gedit-document.c	18 Sep 2003 18:44:25 -0000	1.76
+++ gedit/gedit-document.c	9 Oct 2003 19:34:20 -0000
@@ -725,7 +725,7 @@
 {
 	char* file_contents;
 	GnomeVFSResult res;
-   	gsize file_size;
+   	int file_size;
 	GtkTextIter iter, end;
 	
 	gedit_debug (DEBUG_DOCUMENT, "File to load: %s", uri);
Index: gedit/gedit-plugins-engine.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-plugins-engine.c,v
retrieving revision 1.19
diff -u -u -r1.19 gedit-plugins-engine.c
--- gedit/gedit-plugins-engine.c	2 Jan 2003 22:43:31 -0000	1.19
+++ gedit/gedit-plugins-engine.c	9 Oct 2003 19:34:28 -0000
@@ -31,6 +31,7 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
 #include <dirent.h> 
 #include <string.h>
 
Index: gedit/recent-files/egg-recent-model.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/recent-files/egg-recent-model.c,v
retrieving revision 1.12
diff -u -u -r1.12 egg-recent-model.c
--- gedit/recent-files/egg-recent-model.c	9 Sep 2003 15:54:02 -0000	1.12
+++ gedit/recent-files/egg-recent-model.c	9 Oct 2003 19:34:48 -0000
@@ -37,6 +37,10 @@
 #include "egg-recent-model.h"
 #include "egg-recent-item.h"
 
+#if !HAVE_DECL_LOCKF
+int lockf(int filedes, int function, off_t size);
+#endif
+
 #define EGG_RECENT_MODEL_FILE_PATH "/.recently-used"
 #define EGG_RECENT_MODEL_BUFFER_SIZE 8192
 
Index: plugins/shell_output/shell_output.c
===================================================================
RCS file: /cvs/gnome/gedit/plugins/shell_output/shell_output.c,v
retrieving revision 1.38
diff -u -u -r1.38 shell_output.c
--- plugins/shell_output/shell_output.c	30 Jun 2003 14:14:07 -0000	1.38
+++ plugins/shell_output/shell_output.c	9 Oct 2003 19:35:31 -0000
@@ -393,8 +393,8 @@
 	
 		GError	*error = NULL;
 		gchar   *string = NULL;
-		gint	 len = 0;
-		gint	 pos = 0;
+		gsize	 len = 0;
+		gsize	 pos = 0;
 		gchar 	*line;
 	
 		gedit_debug (DEBUG_PLUGINS, "1");
