SF.net SVN: geany: [2641] trunk

[eht16 at users.sourceforge.net]

Revision: 2641
          http://geany.svn.sourceforge.net/geany/?rev=2641&view=rev
Author:   eht16
Date:     2008-06-04 08:43:52 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Change preprocessor checks for sys/time.h and remove unnecessary sys/stat.h check.
Remove useless or unused configure checks.
Install THANKS file by default.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.in
    trunk/doc/Makefile.am
    trunk/doc/geany.1.in
    trunk/src/dialogs.c
    trunk/src/document.c
    trunk/src/gb.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-04 13:23:43 UTC (rev 2640)
+++ trunk/ChangeLog	2008-06-04 15:43:52 UTC (rev 2641)
@@ -3,6 +3,13 @@
  * src/dialogs.c:
    Restore the previous state of main_status.quitting status when asking
    for reload a changed file instead of setting it to true.
+ * src/dialogs.c, src/document.c:
+   Change preprocessor checks for sys/time.h and remove unnecessary
+   sys/stat.h check.
+ * configure.in, src/gb.c:
+   Remove useless or unused configure checks.
+ * doc/Makefile.am:
+   Install THANKS file by default.
 
 
 2008-06-03  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-06-04 13:23:43 UTC (rev 2640)
+++ trunk/configure.in	2008-06-04 15:43:52 UTC (rev 2641)
@@ -33,16 +33,15 @@
 # autoscan start
 
 # Checks for header files.
-AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h libintl.h limits.h regex.h stddef.h stdlib.h string.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h fnmatch.h glob.h regex.h stdlib.h sys/time.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
 AC_STRUCT_TM
 
 # Checks for library functions.
-AC_CHECK_FUNCS([gethostname ftruncate fgetpos getcwd isascii mblen memset mkstemp realpath regcomp strcasecmp strchr strdup strerror strrchr strstr strtol])
+AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp regcomp strerror strstr])
 
 # autoscan end
 

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2008-06-04 13:23:43 UTC (rev 2640)
+++ trunk/doc/Makefile.am	2008-06-04 15:43:52 UTC (rev 2641)
@@ -40,5 +40,6 @@
 	$(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR)
 	$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR)
 	$(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR)
+	$(INSTALL_DATA) $(top_srcdir)/THANKS $(DOCDIR)
 	$(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
 

Modified: trunk/doc/geany.1.in
===================================================================
--- trunk/doc/geany.1.in	2008-06-04 13:23:43 UTC (rev 2640)
+++ trunk/doc/geany.1.in	2008-06-04 15:43:52 UTC (rev 2641)
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "April 19, 2008" "@PACKAGE@ @VERSION@" ""
+.TH "GEANY" "1" "April 19, 2008" "geany @VERSION@" ""
 .SH "NAME"
 Geany \(em a small and lightweight IDE
 .SH "SYNOPSIS"

Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2008-06-04 13:23:43 UTC (rev 2640)
+++ trunk/src/dialogs.c	2008-06-04 15:43:52 UTC (rev 2641)
@@ -29,16 +29,17 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
 #endif
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
 #include <time.h>
-#endif
+
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+
+/* gstdio.h also includes sys/stat.h */
 #include <glib/gstdio.h>
 
 #include "dialogs.h"
@@ -947,7 +948,7 @@
 {
 	GtkWidget *dialog, *label, *table, *hbox, *image, *perm_table, *check, *vbox;
 	gchar *file_size, *title, *base_name, *time_changed, *time_modified, *time_accessed, *enctext;
-#if defined(HAVE_SYS_STAT_H) && defined(HAVE_SYS_TYPES_H)
+#ifdef HAVE_SYS_TYPES_H
 	struct stat st;
 	off_t filesize;
 	mode_t mode;
@@ -980,7 +981,7 @@
 	}
 
 
-#if defined(HAVE_SYS_STAT_H) && defined(TIME_WITH_SYS_TIME) && defined(HAVE_SYS_TYPES_H)
+#ifdef HAVE_SYS_TYPES_H
 	locale_filename = utils_get_locale_from_utf8(documents[idx]->file_name);
 	if (g_stat(locale_filename, &st) == 0)
 	{

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2008-06-04 13:23:43 UTC (rev 2640)
+++ trunk/src/document.c	2008-06-04 15:43:52 UTC (rev 2641)
@@ -28,26 +28,23 @@
 
 #include "geany.h"
 
-#ifdef TIME_WITH_SYS_TIME
-# include <time.h>
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
+#include <time.h>
+
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+
 #include <ctype.h>
 #include <stdlib.h>
 
+/* gstdio.h also includes sys/stat.h */
 #include <glib/gstdio.h>
 
 #include "document.h"

Modified: trunk/src/gb.c
===================================================================
--- trunk/src/gb.c	2008-06-04 13:23:43 UTC (rev 2640)
+++ trunk/src/gb.c	2008-06-04 15:43:52 UTC (rev 2641)
@@ -30,9 +30,6 @@
 #include <time.h>
 #include <signal.h>
 #include <unistd.h>
-#ifdef HAVE_FCNTL_H
-	#include <fcntl.h>
-#endif
 #include <gdk-pixbuf/gdk-pixdata.h>
 
 #define MAX_PICS 10


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.