summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2007-09-27 23:12:00 +0200
committerMatthieu Herrb <matthieu@bluenote.herrb.com>2007-09-27 23:12:20 +0200
commitfd8a03fbbd74f5cbaa740e5d50fccdf5c1f78b5b (patch)
treeae1c4a45873721a823211b57d87b1fec31ef6f22
parent268f1bb1859e97944e8b63a5bb12677e874ed144 (diff)
fix build with gcc 2.95.
In addition to fixing the C89 issue, the patch also flags a few functions as static to avoid "no previous prototype" warnings.
-rw-r--r--src/builtins/dir.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/builtins/dir.c b/src/builtins/dir.c
index 97f1e1e..1f7f547 100644
--- a/src/builtins/dir.c
+++ b/src/builtins/dir.c
@@ -29,7 +29,7 @@
#endif
#include "builtin.h"
-BuiltinDirPtr
+static BuiltinDirPtr
BuiltinDirsDup (const BuiltinDirPtr a_dirs,
int a_dirs_len)
{
@@ -60,7 +60,7 @@ BuiltinDirsDup (const BuiltinDirPtr a_dirs,
* @param a_saved the saved instance of BuiltinDir to copy into a_cur
* @return 0 if went okay, 1 otherwise.
*/
-int
+static int
BuiltinDirRestore (BuiltinDirPtr a_cur,
const BuiltinDirPtr a_saved)
{
@@ -75,7 +75,7 @@ BuiltinDirRestore (BuiltinDirPtr a_cur,
}
-int
+static int
BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
const BuiltinDirPtr a_saved_tab,
int a_tab_len)
@@ -94,7 +94,7 @@ BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
return 0 ;
}
-BuiltinAliasPtr
+static BuiltinAliasPtr
BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
int a_aliases_len)
{
@@ -122,7 +122,7 @@ BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
* @param a_saved the saved instance of BuiltinAlias to copy into a_cur
* @return 0 if went okay, 1 otherwise.
*/
-int
+static int
BuiltinAliasRestore (BuiltinAliasPtr a_cur,
const BuiltinAliasPtr a_save)
{
@@ -137,7 +137,7 @@ BuiltinAliasRestore (BuiltinAliasPtr a_cur,
return 0 ;
}
-int
+static int
BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
const BuiltinAliasPtr a_saved_tab,
int a_tab_len)
@@ -162,10 +162,10 @@ BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
FontDirectoryPtr dir;
int i;
- dir = FontFileMakeDir ("", builtin_dir_count);
- static BuiltinDirPtr saved_builtin_dir ;
- static BuiltinAliasPtr saved_builtin_alias ;
+ static BuiltinDirPtr saved_builtin_dir;
+ static BuiltinAliasPtr saved_builtin_alias;
+ dir = FontFileMakeDir ("", builtin_dir_count);
if (saved_builtin_dir)
{