summaryrefslogtreecommitdiff
path: root/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c')
-rw-r--r--x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c
index 46840d5f48bb..386f16538a39 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c
@@ -1,6 +1,6 @@
---- ./lib/libxview/file_chooser/file_list.c.orig Tue Jun 29 07:17:56 1993
-+++ ./lib/libxview/file_chooser/file_list.c Sat Apr 1 18:25:23 2000
-@@ -23,6 +23,9 @@ static char sccsid[] = "@(#)file_lis
+--- lib/libxview/file_chooser/file_list.c.orig Thu Oct 5 18:21:11 2006
++++ lib/libxview/file_chooser/file_list.c Thu Oct 5 18:43:18 2006
+@@ -23,6 +23,9 @@
#include <xview_private/flist_impl.h>
#include <xview_private/portable.h>
@@ -10,7 +10,7 @@
/* X bitmaps for default glyphs */
-@@ -41,6 +44,7 @@ static int go_down_one_directory();
+@@ -41,6 +44,7 @@
static int flist_list_notify();
static int validate_new_directory();
static void flist_new_dir();
@@ -18,21 +18,21 @@
#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
static void flist_error(File_list_private *private, char *format, ...);
-@@ -521,7 +525,11 @@ file_list_destroy ( public, status )
+@@ -521,7 +525,11 @@
if (status == DESTROY_CLEANUP) {
xv_free_ref( private->directory );
xv_free_ref( private->regex_pattern );
+#ifndef __FreeBSD__
xv_free_ref( private->regex_compile );
+#else
-+ xv_free_regex_t( (regex_t *)private->regex_compile );
++ xv_free_regex_t( private->regex_compile );
+#endif
xv_free_ref( private->dotdot_string );
if ( private->dir_ptr )
(void) closedir( private->dir_ptr );
-@@ -1174,14 +1182,16 @@ static char *compile();
+@@ -1174,14 +1182,16 @@
static int step();
- #endif /* SVR4 */
+ #endif
-
+#ifndef __FreeBSD__
@@ -48,7 +48,7 @@
char compile_buf[MAXPATHLEN+1];
char *end_ptr;
size_t num_bytes;
-@@ -1197,6 +1207,17 @@ flist_compile_regex( private )
+@@ -1197,6 +1207,17 @@
xv_free_ref( private->regex_compile );
private->regex_compile = xv_alloc_n(char, num_bytes);
(void) XV_BCOPY(compile_buf, private->regex_compile, num_bytes);
@@ -59,14 +59,14 @@
+ exit(-1);
+ }
+ regcomp(compile_buf, private->regex_pattern, 0);
-+ xv_free_regex_t((regex_t *)private->regex_compile);
++ xv_free_regex_t(private->regex_compile);
+ private->regex_compile = (char *)compile_buf;
+#endif
+
}
-@@ -1205,7 +1226,11 @@ flist_match_regex( s, private )
+@@ -1205,7 +1226,11 @@
char *s;
File_list_private *private;
{