generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9e8a8dc1: Merge "Remove ALIGNBYTES and ALIGN from <sys/param.h>"

Browse Source 
* commit '9e8a8dc18cb3162858feef2d4baaf3fa357aa3d2':
  Remove ALIGNBYTES and ALIGN from <sys/param.h>
This commit is contained in:
Calin Juravle 2014-03-24 12:33:50 +00:00 committed by Android Git Automerger
commit 02a1787738
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/bionic/fts.c
View File

@ -51,6 +51,9 @@ static FTSENT *fts_sort(FTS *, FTSENT *, int);
static u_short fts_stat(FTS *, FTSENT *, int); static u_short fts_stat(FTS *, FTSENT *, int);
static int fts_safe_changedir(FTS *, FTSENT *, int, char *); static int fts_safe_changedir(FTS *, FTSENT *, int, char *);
#define ALIGNBYTES (sizeof(uintptr_t) - 1)
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) #define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
#define CLR(opt) (sp->fts_options &= ~(opt)) #define CLR(opt) (sp->fts_options &= ~(opt))

3
libc/dns/gethnamaddr.c
View File

@ -72,6 +72,9 @@
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
#define ALIGNBYTES (sizeof(uintptr_t) - 1)
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
#ifndef LOG_AUTH #ifndef LOG_AUTH
# define LOG_AUTH 0 # define LOG_AUTH 0
#endif #endif

10
libc/include/sys/param.h
View File

@ -34,16 +34,6 @@
#define MAXPATHLEN PATH_MAX #define MAXPATHLEN PATH_MAX
#define MAXSYMLINKS 8 #define MAXSYMLINKS 8
#if __LP64__
#define ALIGNBYTES 7
#else
#define ALIGNBYTES 3
#endif
#ifndef ALIGN
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
#endif
/* Macros for counting and rounding. */ /* Macros for counting and rounding. */
#ifndef howmany #ifndef howmany
#define howmany(x, y) (((x)+((y)-1))/(y)) #define howmany(x, y) (((x)+((y)-1))/(y))

3
libc/stdio/findfp.c
View File

@ -41,6 +41,9 @@
#include "glue.h" #include "glue.h"
#include "private/thread_private.h" #include "private/thread_private.h"
#define ALIGNBYTES (sizeof(uintptr_t) - 1)
#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) &~ ALIGNBYTES)
int __sdidinit; int __sdidinit;
#define NDYNAMIC 10 /* add ten more whenever necessary */ #define NDYNAMIC 10 /* add ten more whenever necessary */