[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH] Fix compilation if readline library is not present.



Ditto for readline.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v
>From dc4f3e2cee4d2a0e3030c3e7067e8f3e33df56db Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones redhat com>
Date: Tue, 10 Nov 2009 12:34:27 +0000
Subject: [PATCH] Fix compilation if readline library is not present.

---
 fish/destpaths.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/fish/destpaths.c b/fish/destpaths.c
index 1e42ae8..15290da 100644
--- a/fish/destpaths.c
+++ b/fish/destpaths.c
@@ -31,6 +31,7 @@
 
 #include "fish.h"
 
+#ifdef HAVE_LIBREADLINE
 // From gnulib's xalloc.h:
 /* Return 1 if an array of N objects, each of size S, cannot exist due
    to size arithmetic overflow.  S must be positive and N must be
@@ -46,6 +47,7 @@
    branch when S is known to be 1.  */
 # define xalloc_oversized(n, s) \
     ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
+#endif
 
 /* Readline completion for paths on the guest filesystem, also for
  * devices and LVM names.
@@ -58,6 +60,7 @@ struct word {
   int is_dir;
 };
 
+#ifdef HAVE_LIBREADLINE
 static void
 free_words (struct word *words, size_t nr_words)
 {
@@ -68,6 +71,7 @@ free_words (struct word *words, size_t nr_words)
     free (words[i].name);
   free (words);
 }
+#endif
 
 char *
 complete_dest_paths_generator (const char *text, int state)
-- 
1.6.5.rc2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]