From 855dc62e3074485f54fca56b7c4fa36dabc769f1 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Sun, 23 Aug 2009 22:24:09 +0200
Subject: [PATCH] Git merge artifact.

---
 src/decode-ipv4.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/decode-ipv4.c b/src/decode-ipv4.c
index c3b27262f3..6313d1ad8f 100644
--- a/src/decode-ipv4.c
+++ b/src/decode-ipv4.c
@@ -579,8 +579,6 @@ void DecodeIPV4(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, uint8_t *pkt,
 #ifdef UNITTESTS
 
 void DecodeIPV4OptionsPrint(Packet *p) {
-/** \todo Fix this on 32bit */
-#if 0
     IPV4Vars *pv = &p->ip4vars;
 
     printf("DecodeIPV4Options: cnt=%" PRIu8