From e0064797fb53cb60feb32bdb316a902ccca6dd07 Mon Sep 17 00:00:00 2001
From: Bill Meier <wmeier@newsguy.com>
Date: Tue, 19 Jan 2010 19:37:03 +0000
Subject: Use more unique names for certain enum constants. (enum constant
 names are part of the global name space). (Fixes at least one gcc -Wshadow
 warning).

svn path=/trunk/; revision=31572
---
 epan/frame_data.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'epan/frame_data.c')

diff --git a/epan/frame_data.c b/epan/frame_data.c
index 68b383df24..e0c631a1c9 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -203,7 +203,7 @@ frame_data_init(frame_data *fdata, guint32 num,
   fdata->abs_ts.secs = phdr->ts.secs;
   fdata->abs_ts.nsecs = phdr->ts.nsecs;
   fdata->flags.passed_dfilter = 0;
-  fdata->flags.encoding = CHAR_ASCII;
+  fdata->flags.encoding = PACKET_CHAR_ENC_CHAR_ASCII;
   fdata->flags.visited = 0;
   fdata->flags.marked = 0;
   fdata->flags.ref_time = 0;
-- 
cgit v1.2.3