diff options
author | Guy Harris <guy@alum.mit.edu> | 2008-06-24 03:38:15 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2008-06-24 03:38:15 +0000 |
commit | f441b8941eee0a6878500e95557d136f4c63e9a4 (patch) | |
tree | 85804bf42e519f493c87fe87e821d9c3cedfbec4 /capture_info.h | |
parent | f8b78637532b77b7feabadea280ca900f7a72292 (diff) |
Add gtk/capture_globals.h, to declare global_capture_opts, so files that
don't need global_capture_opts don't need to have it declared and thus
don't need capture_options defined.
Include gtk/capture_globals in the files in question.
Change some more capture_opts references to refer to
global_capture_opts.
Change some global_capture_opts references in routines with a
capture_opts argument to refer to capture_opts.
The structure type is capture_options, not capture_opts; fix some
references.
Include <sys/types.h>, if it's present, in capture_opts.h, so we get
gid_t defined.
Clean up indentation.
svn path=/trunk/; revision=25574
Diffstat (limited to 'capture_info.h')
-rw-r--r-- | capture_info.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/capture_info.h b/capture_info.h index 6943314c0f..29df790178 100644 --- a/capture_info.h +++ b/capture_info.h @@ -32,9 +32,10 @@ #ifndef __CAPTURE_INFO_H__ #define __CAPTURE_INFO_H__ +#include "capture_opts.h" /* open the info - init values (wtap, counts), create dialog */ -extern void capture_info_open(capture_opts *capture_opts); +extern void capture_info_open(capture_options *capture_opts); /* new file arrived - (eventually close old wtap), open wtap */ extern gboolean capture_info_new_file(const char *new_filename); @@ -62,7 +63,7 @@ typedef struct { /** Create the capture info dialog */ extern void capture_info_ui_create( capture_info *cinfo, -capture_opts *capture_opts); +capture_options *capture_opts); /** Update the capture info counters in the dialog */ extern void capture_info_ui_update( |