summary refs log tree commit diff stats
path: root/util/aes.c
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2013-07-29 09:03:23 +0200
committerAurelien Jarno <aurelien@aurel32.net>2013-07-29 09:03:23 +0200
commit461bdb3414c40d6806194bf68c91521496b1042d (patch)
tree8351478144c07306f24923791b1e4cd988770513 /util/aes.c
parentb6a9f4682e62c686995cc1a1fe2ef4a57a92020b (diff)
parent6c86f405efd6532b58ad1b607cc9f11e856ef5ca (diff)
downloadfocaccia-qemu-461bdb3414c40d6806194bf68c91521496b1042d.tar.gz
focaccia-qemu-461bdb3414c40d6806194bf68c91521496b1042d.zip
Merge branch 'trivial-patches' of git://git.corpit.ru/qemu
* 'trivial-patches' of git://git.corpit.ru/qemu:
  target-mips: Remove assignment to a variable which is never used
  misc: Use g_assert_not_reached for code which is expected to be unreachable
  qemu-options: mention C-a h in the -nographic doc
  misc: Fix new typos in comments and strings
  linux-user: correct argument number for sys_mremap and sys_splice
  PPC: dbdma: macio: Fix format specifiers (build regression)
  watchdog: Remove break after exit
  exec: Remove env from list of poisoned names
  hw/9pfs: Fix potential memory leak and avoid reuse of freed memory
  timer: make timers_state static
  aes: Remove unused code (NDEBUG, u16)
Diffstat (limited to 'util/aes.c')
-rw-r--r--util/aes.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/util/aes.c b/util/aes.c
index 91e97fa6e7..4b4d88e7e6 100644
--- a/util/aes.c
+++ b/util/aes.c
@@ -30,12 +30,7 @@
 #include "qemu-common.h"
 #include "qemu/aes.h"
 
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-
 typedef uint32_t u32;
-typedef uint16_t u16;
 typedef uint8_t u8;
 
 /* This controls loop-unrolling in aes_core.c */