Skip to content

Commit

Permalink
Merge branch 'master' of github.com:D-Programming-Language/phobos
Browse files Browse the repository at this point in the history
  • Loading branch information
WalterBright committed Jan 30, 2011
2 parents c4b7e93 + 108c4e1 commit f2c3ff2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
File renamed without changes.
12 changes: 1 addition & 11 deletions posix.mak
Expand Up @@ -139,11 +139,7 @@ else
endif

# Set DDOC, the documentation generator
ifeq ($(OS),linux)
DDOC=dmd
else
DDOC=dmd
endif
DDOC=dmd

# Set LIB, the ultimate target
ifeq (,$(findstring win,$(OS)))
Expand Down Expand Up @@ -242,21 +238,15 @@ ifeq ($(MODEL),64)
DISABLED_TESTS = \
std/algorithm \
std/complex \
std/concurrency \
std/conv \
std/datetime \
std/file \
std/format \
std/math \
std/mmfile \
std/numeric \
std/random \
std/range \
std/signals \
std/stdio \
std/stream \
std/variant \
std/zlib \
std/internal/math/biguintnoasm

$(addprefix $(ROOT)/unittest/,$(DISABLED_TESTS)) :
Expand Down
6 changes: 3 additions & 3 deletions std/zip.d
Expand Up @@ -83,8 +83,8 @@ class ArchiveMember
{
void print()
{
printf("name = '%.*s'\n", name);
printf("\tcomment = '%.*s'\n", comment);
printf("name = '%.*s'\n", name.length, name.ptr);
printf("\tcomment = '%.*s'\n", comment.length, comment.ptr);
printf("\tmadeVersion = x%04x\n", madeVersion);
printf("\textractVersion = x%04x\n", extractVersion);
printf("\tflags = x%04x\n", flags);
Expand Down Expand Up @@ -136,7 +136,7 @@ class ZipArchive
printf("\tdiskStartDir = %u\n", diskStartDir);
printf("\tnumEntries = %u\n", numEntries);
printf("\ttotalEntries = %u\n", totalEntries);
printf("\tcomment = '%.*s'\n", comment);
printf("\tcomment = '%.*s'\n", comment.length, comment.ptr);
}
}

Expand Down

0 comments on commit f2c3ff2

Please sign in to comment.