fiddlerwoaroof/crawl - Change PQYSVXOLM6L4OGWQNXUHXXNUXJ33TTS36TIVHRPKMYQHQY42EBNQC

fix 'DEBUG' macro usage consistency

Sometimes we were doing #if DEBUG and others we were doing #ifdef DEBUG.

If we mix both, we have problems: If the DEBUG macro isn't defined, the statement '#if DEBUG' doesn't really make sense logically, because 'DEBUG' has no value. And if we '#define DEBUG 0', then the '#ifdef DEBUG's become true statements.

The easiest fix is to swap out the #ifs with #ifdefs.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Created by Steven Noonan on October 13, 2009

PQYSVXOLM6L4OGWQNXUHXXNUXJ33TTS36TIVHRPKMYQHQY42EBNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilebuf.cc at line 30 [8.15207]
B:BD[8.15848] → [5.9136:9146]
```
#if DEBUG
```
[8.15848]
[8.15848]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/stuff.h at line 233 [10.217090]
B:BD[9.253] → [9.253:263]
```
#if DEBUG
```
[9.253]
[9.263]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/stuff.h at line 245 [10.217090]
B:BD[11.698] → [9.326:336]
```
#if DEBUG
```
[11.698]
[12.417]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/stuff.h at line 252 [10.217090]
B:BD[11.736] → [7.395:405]
```
#if DEBUG
```
[11.736]
[12.453]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/store.cc at line 521 [13.12569]
B:BD[13.21918] → [2.143:153]
```
#if DEBUG
```
[13.21918]
[13.21918]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/store.cc at line 556 [13.12569]
B:BD[13.22934] → [2.162:172]
```
#if DEBUG
```
[13.22934]
[13.22934]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/store.cc at line 1142 [13.12569]
B:BD[13.34180] → [13.34180:34190]
```
#if DEBUG
```
[13.34180]
[13.34190]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/store.cc at line 1258 [13.12569]
B:BD[13.36580] → [2.181:191]
```
#if DEBUG
```
[13.36580]
[13.36580]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/store.cc at line 1425 [13.12569]
B:BD[13.40088] → [13.40088:40098]
```
#if DEBUG
```
[13.40088]
[13.40098]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/spl-util.cc at line 95 [10.245665]
B:BD[14.311] → [14.311:321]
```
#if DEBUG
```
[14.311]
[14.321]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/religion.cc at line 1430 [10.804403]
B:BD[3.2986] → [3.2986:2996]
```
#if DEBUG
```
[3.2986]
[3.2996]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/player.cc at line 2821 [10.962854]
B:BD[15.1087] → [15.1087:1097]
```
#if DEBUG
```
[15.1087]
[15.1097]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/player.cc at line 2846 [10.962854]
B:BD[15.1938] → [15.1938:1948]
```
#if DEBUG
```
[15.1938]
[16.5510]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/player.cc at line 2863 [10.962854]
B:BD[15.2475] → [15.2475:2485]
```
#if DEBUG
```
[15.2475]
[16.5819]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/newgame.cc at line 1097 [10.1132300]
B:BD[17.2519] → [4.2619:2629]
```
#if DEBUG
```
[17.2519]
[18.16504]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/monstuff.cc at line 7531 [10.1396662]
B:BD[19.454] → [20.3896:3906]
```
#if DEBUG
```
[19.454]
[20.3906]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/monstuff.cc at line 7652 [10.1396662]
B:BD[21.1417] → [21.1417:1427]
```
#if DEBUG
```
[21.1417]
[21.1427]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/items.cc at line 413 [10.2584728]
B:BD[10.2595376] → [10.2595376:2595386]
```
#if DEBUG
```
[10.2595376]
[10.2595386]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/describe.cc at line 2401 [10.3736416]
∅:D[22.21177] → [10.3886211:3886221]
B:BD[10.3886211] → [10.3886211:3886221]
```
#if DEBUG
```
[22.21177]
[22.21178]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/debug.h at line 14 [10.4011741]
B:BD[10.4012343] → [10.4012343:4012372]
```
#if DEBUG && defined(NDEBUG)
```
[10.4012343]
[10.4012372]
```
#if defined(DEBUG) && defined(NDEBUG)
```
Replacement in crawl-ref/source/debug.h at line 18 [10.4011741]
B:BD[10.4012421] → [10.4012421:4012452]
```
#if !DEBUG && !defined(NDEBUG)
```
[10.4012421]
[10.4012452]
```
#if !defined(DEBUG) && !defined(NDEBUG)
```
Replacement in crawl-ref/source/debug.h at line 39 [10.4011741]
B:BD[10.4012901] → [10.4012901:4012911]
```
#if DEBUG
```
[10.4012901]
[10.4012911]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/debug.cc at line 102 [10.4016436]
B:BD[10.4018110] → [10.4018110:4018120]
```
#if DEBUG
```
[10.4018110]
[23.5581]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/debug.cc at line 127 [10.4016436]
B:BD[10.4024305] → [10.4024305:4024315]
```
#if DEBUG
```
[10.4024305]
[6.2745]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/debug.cc at line 154 [10.4016436]
B:BD[10.4024926] → [10.4024926:4024936]
```
#if DEBUG
```
[10.4024926]
[10.4024936]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/debug.cc at line 6571 [10.4016436]
B:BD[24.11089] → [6.2805:2815]
```
#if DEBUG
```
[24.11089]
[6.2815]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/beam.cc at line 1497 [10.4128068]
B:BD[14.3893] → [14.3893:3903]
```
#if DEBUG
```
[14.3893]
[14.3903]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/acr.cc at line 18 [10.4397395]
B:BD[10.4399508] → [10.4399508:4399518]
```
#if DEBUG
```
[10.4399508]
[10.4399518]
```
#ifdef DEBUG
```
Replacement in crawl-ref/source/AppHdr.h at line 336 [10.4573713]
B:BD[10.4582530] → [10.4582530:4582540]
```
#if DEBUG
```
[10.4582530]
[10.4582540]
```
#ifdef DEBUG
```

fix 'DEBUG' macro usage consistency

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilebuf.cc at line 30 [8.15207]

Replacement in crawl-ref/source/stuff.h at line 233 [10.217090]

Replacement in crawl-ref/source/stuff.h at line 245 [10.217090]

Replacement in crawl-ref/source/stuff.h at line 252 [10.217090]

Replacement in crawl-ref/source/store.cc at line 521 [13.12569]

Replacement in crawl-ref/source/store.cc at line 556 [13.12569]

Replacement in crawl-ref/source/store.cc at line 1142 [13.12569]

Replacement in crawl-ref/source/store.cc at line 1258 [13.12569]

Replacement in crawl-ref/source/store.cc at line 1425 [13.12569]

Replacement in crawl-ref/source/spl-util.cc at line 95 [10.245665]

Replacement in crawl-ref/source/religion.cc at line 1430 [10.804403]

Replacement in crawl-ref/source/player.cc at line 2821 [10.962854]

Replacement in crawl-ref/source/player.cc at line 2846 [10.962854]

Replacement in crawl-ref/source/player.cc at line 2863 [10.962854]

Replacement in crawl-ref/source/newgame.cc at line 1097 [10.1132300]

Replacement in crawl-ref/source/monstuff.cc at line 7531 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7652 [10.1396662]

Replacement in crawl-ref/source/items.cc at line 413 [10.2584728]

Replacement in crawl-ref/source/describe.cc at line 2401 [10.3736416]

Replacement in crawl-ref/source/debug.h at line 14 [10.4011741]

Replacement in crawl-ref/source/debug.h at line 18 [10.4011741]

Replacement in crawl-ref/source/debug.h at line 39 [10.4011741]

Replacement in crawl-ref/source/debug.cc at line 102 [10.4016436]

Replacement in crawl-ref/source/debug.cc at line 127 [10.4016436]

Replacement in crawl-ref/source/debug.cc at line 154 [10.4016436]

Replacement in crawl-ref/source/debug.cc at line 6571 [10.4016436]

Replacement in crawl-ref/source/beam.cc at line 1497 [10.4128068]

Replacement in crawl-ref/source/acr.cc at line 18 [10.4397395]

Replacement in crawl-ref/source/AppHdr.h at line 336 [10.4573713]