am 8826ba8a: am bc545e8a: Merge "Fix x86_64 build, clean up intermediate libraries."

* commit '8826ba8ab6922927bdac2466d2903916d5806a06':
  Fix x86_64 build, clean up intermediate libraries.
This commit is contained in:
Elliott Hughes
2013-10-09 16:35:46 -07:00
committed by Android Git Automerger
90 changed files with 239 additions and 209 deletions

View File

@@ -171,7 +171,7 @@
#undef XLOG
#if DEBUG
# include "libc_logging.h"
# include "private/libc_logging.h"
# define XLOG(...) __libc_format_log(ANDROID_LOG_DEBUG,"libc",__VA_ARGS__)
#include <stdio.h>

View File

@@ -119,7 +119,7 @@ __RCSID("$NetBSD: res_send.c,v 1.9 2006/01/24 17:41:25 christos Exp $");
# include <resolv_cache.h>
#endif
#include "libc_logging.h"
#include "private/libc_logging.h"
#ifndef DE_CONST
#define DE_CONST(c,v) v = ((c) ? \

View File

@@ -42,7 +42,7 @@
#define DEBUG 0
#if DEBUG
# include "libc_logging.h"
# include "private/libc_logging.h"
# include <unistd.h> /* for gettid() */
# define D(...) __libc_format_log(ANDROID_LOG_DEBUG,"libc", __VA_ARGS__)
#else