Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 707d0b6d authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "zip_writer.cc: update powerof2 and use it unconditionally" am: b86e248e

am: 0fd9adf7

Change-Id: Id31eb3c2b8ae67dbe6c8d255879a6cc0543a5abe
parents 51ca4889 0fd9adf7
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -30,9 +30,13 @@
#include "entry_name_utils-inl.h"
#include "zip_archive_common.h"

#if !defined(powerof2)
#define powerof2(x) ((((x)-1) & (x)) == 0)
#endif
#undef powerof2
#define powerof2(x)                                               \
  ({                                                              \
    __typeof__(x) _x = (x);                                       \
    __typeof__(x) _x2;                                            \
    __builtin_add_overflow(_x, -1, &_x2) ? 1 : ((_x2 & _x) == 0); \
  })

/* Zip compression methods we support */
enum {