diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2014-06-11 06:45:30 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2014-06-11 06:45:30 -0700 |
| commit | b2eebed31eff3243c75726818ca0c7f2868e3182 (patch) | |
| tree | a12e0e4d3809e1d53d902d96c0003e4c310e5df6 /lib.h | |
| parent | 79f55cbf6c6e7412473e119a02aa637e985721f5 (diff) | |
| download | txr-b2eebed31eff3243c75726818ca0c7f2868e3182.tar.gz txr-b2eebed31eff3243c75726818ca0c7f2868e3182.tar.bz2 txr-b2eebed31eff3243c75726818ca0c7f2868e3182.zip | |
* Makefile (txr.o): Pass TXR_VER preprocessor symbol on gcc command
line.
(PREINSTALL): New variable holding a step for the install recipe.
(pax tar zip): New targets.
* configure (txr_ver): Version now added to config.make, passed
through to txr.c.
(gen_config_make): bindir, datadir and mandir are established
using gmake's regular macro assignment (=) rather than
expanding assignment (:=). This allows us to override the
prefix variable after configure time.
* lib.h (wli_noex): New macro.
(wli): Retarget to wli_noex, so that argument is subject
to macro replacement.
* txr.c (version): Use TXR_VER defined on compiler command line,
rather than hard-coded string literal.
Diffstat (limited to 'lib.h')
| -rw-r--r-- | lib.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -289,14 +289,15 @@ INLINE type_t type(val obj) typedef struct wli wchli_t; #if LIT_ALIGN < 4 -#define wli(lit) ((const wchli_t *) (L"\0" L ## lit L"\0" + 1)) +#define wli_noex(lit) ((const wchli_t *) (L"\0" L ## lit L"\0" + 1)) #define wini(ini) L"\0" L ## ini L"\0" #define wref(arr) ((arr) + 1) #else -#define wli(lit) ((const wchli_t *) L ## lit) +#define wli_noex(lit) ((const wchli_t *) L ## lit) #define wini(ini) L ## ini #define wref(arr) (arr) #endif +#define wli(lit) wli_noex(lit) INLINE val auto_str(const wchli_t *str) { |