SF.net SVN: geany: [617] trunk

[eht16 at users.sourceforge.net]

Revision: 617
Author:   eht16
Date:     2006-07-24 11:05:40 -0700 (Mon, 24 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=617&view=rev

Log Message:
-----------
Fixed some cross compiling/Win32 issues.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/geany.h
    trunk/tagmanager/ctags.c
    trunk/tagmanager/general.h
    trunk/tagmanager/parse.c
    trunk/tagmanager/strlist.c
    trunk/tagmanager/tm_project.c
    trunk/tagmanager/tm_workspace.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/ChangeLog	2006-07-24 18:05:40 UTC (rev 617)
@@ -1,3 +1,10 @@
+2006-07-24  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/geany.h, tagmanager/strlist.c, tagmanager/tm_project.c,
+   tagmanager/parse.c, tagmanager/general.h, tagmanager/ctags.c,
+   tagmanager/tm_workspace.c: Fixed some cross compiling/Win32 issues.
+
+
 2006-07-24  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/geany.h: Use generic font names & increase the default size.

Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/src/geany.h	2006-07-24 18:05:40 UTC (rev 617)
@@ -43,7 +43,7 @@
 #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l)
 
 
-#ifdef G_OS_WIN32
+#if defined(G_OS_WIN32) || defined(WIN32)
 # include <windows.h>
 # include <commdlg.h>
 # define GEANY_WIN32

Modified: trunk/tagmanager/ctags.c
===================================================================
--- trunk/tagmanager/ctags.c	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/tagmanager/ctags.c	2006-07-24 18:05:40 UTC (rev 617)
@@ -45,8 +45,8 @@
 
 #include <stdarg.h>
 
-#define HAVE_MKSTEMP 1
 
+
 /*  To declare "struct stat" and stat ().
  */
 #if defined (HAVE_SYS_TYPES_H)
@@ -214,7 +214,9 @@
 #endif
 
 char *CurrentDirectory = NULL;
+#ifdef HAVE_MKSTEMP
 static const char *ExecutableProgram = NULL;
+#endif
 static const char *ExecutableName = NULL;
 static stringList* Excluded = NULL;
 

Modified: trunk/tagmanager/general.h
===================================================================
--- trunk/tagmanager/general.h	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/tagmanager/general.h	2006-07-24 18:05:40 UTC (rev 617)
@@ -87,8 +87,15 @@
 #  define FA_DIREC _A_SUBDIR
 #  define ff_name name
 # endif
+// provide the prototype for cross-compiling/Windows
+char *lrealpath(const char *filename);
 #endif
 
+#ifndef HAVE_FNMATCH_H
+// provide the prototype for cross-compiling/Windows
+int fnmatch(const char *pattern, const char *string, int flags);
+#endif
+
 #ifdef DJGPP
 # define CASE_INSENSITIVE_FILENAMES
 # define MSDOS_STYLE_PATH

Modified: trunk/tagmanager/parse.c
===================================================================
--- trunk/tagmanager/parse.c	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/tagmanager/parse.c	2006-07-24 18:05:40 UTC (rev 617)
@@ -15,9 +15,6 @@
 #include "general.h"	/* must always come first */
 
 #include <string.h>
-#ifndef G_OS_WIN32
-# include <fnmatch.h>
-#endif
 
 
 #include "entry.h"

Modified: trunk/tagmanager/strlist.c
===================================================================
--- trunk/tagmanager/strlist.c	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/tagmanager/strlist.c	2006-07-24 18:05:40 UTC (rev 617)
@@ -14,7 +14,7 @@
 #include "general.h"	/* must always come first */
 
 #include <string.h>
-#ifndef G_OS_WIN32
+#ifdef HAVE_FNMATCH_H
 # include <fnmatch.h>
 #endif
 

Modified: trunk/tagmanager/tm_project.c
===================================================================
--- trunk/tagmanager/tm_project.c	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/tagmanager/tm_project.c	2006-07-24 18:05:40 UTC (rev 617)
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#ifndef G_OS_WIN32
+#ifdef HAVE_FNMATCH_H
 # include <fnmatch.h>
 #endif
 

Modified: trunk/tagmanager/tm_workspace.c
===================================================================
--- trunk/tagmanager/tm_workspace.c	2006-07-24 17:56:16 UTC (rev 616)
+++ trunk/tagmanager/tm_workspace.c	2006-07-24 18:05:40 UTC (rev 617)
@@ -161,9 +161,9 @@
 {
 #ifdef HAVE_GLOB_H
 	glob_t globbuf;
+	size_t idx_glob;
 #endif
 	int idx_inc;
-	size_t idx_glob;
 	char *command;
 	guint i;
 	FILE *fp;


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