libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

United macro Xorriso_jte_standalonE with macro Xorriso_standalonE

Browse Source
This commit is contained in:
Thomas Schmitt 2010-10-15 12:55:03 +00:00
parent bd3df5819e
commit de8352125c
5 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libisoburn/trunk/libisoburn/burn_wrap.c
View File

@ -34,30 +34,21 @@
#ifndef Xorriso_standalonE
#include <libburn/libburn.h>
#include <libisofs/libisofs.h>
#ifdef Xorriso_with_libjtE
#include <libjte/libjte.h>
#endif
#else /* ! Xorriso_standalonE */
#include "../libisofs/libisofs.h"
#include "../libburn/libburn.h"
#endif /* Xorriso_standalonE */
/* >>> later change this to Xorriso_standalonE */
#ifdef Xorriso_jte_standalonE
#ifdef Xorriso_with_libjtE
#include "../libjte/libjte.h"
#endif
#else
#endif /* Xorriso_standalonE */
#ifdef Xorriso_with_libjtE
#include <libjte/libjte.h>
#endif
#endif /* ! Xorriso_jte_standalonE */
#include "libisoburn.h"
#include "isoburn.h"

5
libisoburn/trunk/xorriso/base_obj.c
View File

@ -27,8 +27,7 @@
#include <errno.h>
#include <stdint.h>
/* >>> later change this to Xorriso_standalonE */
#ifdef Xorriso_jte_standalonE
#ifdef Xorriso_standalonE
#ifdef Xorriso_with_libjtE
#include "../libjte/libjte.h"
@ -40,7 +39,7 @@
#include <libjte/libjte.h>
#endif
#endif /* ! Xorriso_jte_standalonE */
#endif /* ! Xorriso_standalonE */
#include "xorriso.h"
#include "xorriso_private.h"

5
libisoburn/trunk/xorriso/configure_ac.txt
View File

@ -247,11 +247,6 @@ if test x$ZLIB_DEF = xyes
then
AC_DEFINE([Xorriso_with_libjtE], [])
AC_DEFINE([Libisofs_with_libjtE], [])
# >>> Only until built-in libjte becomes default with xorriso-standalone
AH_TEMPLATE([Xorriso_jte_standalonE], [Preliminary switch])
AC_DEFINE([Xorriso_jte_standalonE], [])
LIBJTE_DEF=yes
echo "enabled built-in libjte"
else

5
libisoburn/trunk/xorriso/lib_mgt.c
View File

@ -29,8 +29,7 @@
#include <iconv.h>
#include <langinfo.h>
/* >>> later change this to Xorriso_standalonE */
#ifdef Xorriso_jte_standalonE
#ifdef Xorriso_standalonE
#ifdef Xorriso_with_libjtE
#include "../libjte/libjte.h"
@ -42,7 +41,7 @@
#include <libjte/libjte.h>
#endif
#endif /* ! Xorriso_jte_standalonE */
#endif /* ! Xorriso_standalonE */
#include "xorriso.h"
#include "xorriso_private.h"

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.10.15.121533"
#define Xorriso_timestamP "2010.10.15.125440"