diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-26 17:08:48 +0200 |
| commit | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (patch) | |
| tree | ad86feed38d780515cf9da608c5ea21eed04e17d /libXmu/src | |
| parent | 4f67039e9191d5251c39069bd791a05c5cf22022 (diff) | |
| parent | 873965b49f283ad028dd4e0e5b7e93a758c84993 (diff) | |
| download | vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.gz vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.tar.bz2 vcxsrv-95acf9816e008fa46a6c2fa2f35500deb358bb69.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXmu/src/CmapAlloc.c
Diffstat (limited to 'libXmu/src')
| -rw-r--r-- | libXmu/src/CmapAlloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXmu/src/CmapAlloc.c b/libXmu/src/CmapAlloc.c index 96ec3cf0b..31cc153ca 100644 --- a/libXmu/src/CmapAlloc.c +++ b/libXmu/src/CmapAlloc.c @@ -330,7 +330,7 @@ icbrt_with_guess(int a, int guess) icbrt_loopcount++; #endif delta = (guess - a/(guess*guess))/3; -#ifdef _X_ROOT_STATS +#if defined(DEBUG) && defined(_X_ROOT_STATS) printf("pass %d: guess=%d, delta=%d\n", icbrt_loopcount, guess, delta); #endif guess -= delta; |