mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-01 23:50:43 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dmd-2.060' into master.

Browse source 
Conflicts:
	dmd2/func.c
	dmd2/mars.c
This commit is contained in:
David Nadlinger 2012-09-07 04:15:44 +02:00
commit bf0d8afc88
143 changed files with 18692 additions and 18365 deletions
Download patch file Download diff file Expand all files Collapse all files

10
driver/main.cpp
View file

@ -23,6 +23,11 @@
#include "rmem.h"
#include "root.h"
// stricmp
#if __GNUC__ && !_WIN32
#include "gnuc.h"
#endif
#include "mars.h"
#include "module.h"
#include "mtype.h"
@ -835,10 +840,7 @@ int main(int argc, char** argv)
#endif
if (stricmp(ext, global.mars_ext) == 0 ||
stricmp(ext, global.hdr_ext) == 0 ||
stricmp(ext, "htm") == 0 ||
stricmp(ext, "html") == 0 ||
stricmp(ext, "xhtml") == 0)
stricmp(ext, global.hdr_ext) == 0)
{
ext--; // skip onto '.'
assert(*ext == '.');