From 03f6935e358e583ec08c54f2762e913d236c6078 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 1 Oct 2010 19:02:57 +0000
Subject: [PATCH] Made two non-public parameters independent of
 Xorriso_with_libjtE

---
 libisoburn/trunk/xorriso/base_obj.c          | 8 ++++----
 libisoburn/trunk/xorriso/xorriso_private.h   | 2 +-
 libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libisoburn/trunk/xorriso/base_obj.c b/libisoburn/trunk/xorriso/base_obj.c
index c7ac1e3b..68f0d5f5 100644
--- a/libisoburn/trunk/xorriso/base_obj.c
+++ b/libisoburn/trunk/xorriso/base_obj.c
@@ -223,10 +223,10 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
 
 #ifdef Xorriso_with_libjtE
  m->libjte_handle= NULL;
- m->jigdo_params= NULL;
- m->jigdo_values= NULL;
 #endif
 
+ m->jigdo_params= NULL;
+ m->jigdo_values= NULL;
  m->loaded_boot_bin_lba= 0;
  m->loaded_boot_cat_path[0]= 0;
  m->allow_graft_points= 0;
@@ -432,10 +432,10 @@ int Xorriso_destroy(struct XorrisO **xorriso, int flag)
 #ifdef Xorriso_with_libjtE
  if(m->libjte_handle)
    libjte_destroy(&(m->libjte_handle));
- Xorriso_lst_destroy_all(&(m->jigdo_params), 0);
- Xorriso_lst_destroy_all(&(m->jigdo_values), 0);
 #endif
 
+ Xorriso_lst_destroy_all(&(m->jigdo_params), 0);
+ Xorriso_lst_destroy_all(&(m->jigdo_values), 0);
  Xorriso_detach_libraries(m, flag&1);
 
  free((char *) m);
diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h
index 8aa76c9a..d4330679 100644
--- a/libisoburn/trunk/xorriso/xorriso_private.h
+++ b/libisoburn/trunk/xorriso/xorriso_private.h
@@ -329,12 +329,12 @@ struct XorrisO { /* the global context of xorriso */
 #ifdef Xorriso_with_libjtE
  /* Parameters and state of Jigdo Template Export environment */
  struct libjte_env *libjte_handle;
+#endif
 
  /* List of -jigdo parameters since the most recent -jigdo clear */
  struct Xorriso_lsT *jigdo_params;
  struct Xorriso_lsT *jigdo_values;
 
-#endif
 
  /* LBA of boot image after image loading */
  int loaded_boot_bin_lba;
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 936f13ac..72d62262 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.09.30.074208"
+#define Xorriso_timestamP "2010.10.01.190235"