fiddlerwoaroof/crawl - Change UZR4A4RU5T3ESL3YUWXPYICRZN2M2MVGT32SZSCZGVWF6HOJJHLAC

Added #ifdef to allow compatibility with the old -macro <file> option. This

option is restricted to dgamelaunch because it has security issues if used with the traditional multiuser setuid/setgid install.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1187 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on April 2, 2007

UZR4A4RU5T3ESL3YUWXPYICRZN2M2MVGT32SZSCZGVWF6HOJJHLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/macro.cc at line 178 [4.2457534]
[3.270]
[3.270]
```
#ifndef DGL_MACRO_ABSOLUTE_PATH
```
Insertion in crawl-ref/source/macro.cc at line 181 [4.2457534]
[3.358]
[3.358]
```
#endif
```

Replacement in crawl-ref/source/macro.cc at line 184 [4.2457534]

B:BD[2.109] → [2.109:137]

#ifdef DGL_NAMED_MACRO_FILE

[2.109]

[2.137]

#if defined(DGL_MACRO_ABSOLUTE_PATH)
    return (dir.empty()? "macro.txt" : dir);
#elif defined(DGL_NAMED_MACRO_FILE)

Replacement in crawl-ref/source/macro.cc at line 190 [4.2457534]
B:BD[3.401] → [2.222:233]
```
#endif    
```
[3.401]
[4.2459302]
```
#endif
```

Insertion in crawl-ref/source/AppHdr.h at line 230 [4.4573713]

[2.484]

[5.27978]


    // Uses Options.macro_dir as the full path to the macro file. Mutually
    // exclusive with DGL_NAMED_MACRO_FILE.
    #define DGL_MACRO_ABSOLUTE_PATH

Added #ifdef to allow compatibility with the old -macro <file> option. This

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/macro.cc at line 178 [4.2457534]

Insertion in crawl-ref/source/macro.cc at line 181 [4.2457534]

Replacement in crawl-ref/source/macro.cc at line 184 [4.2457534]

Replacement in crawl-ref/source/macro.cc at line 190 [4.2457534]

Insertion in crawl-ref/source/AppHdr.h at line 230 [4.4573713]