From aba7601f25ad0f56fc7730bb38d0f0ab974abe13 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 27 Mar 2012 14:53:31 +0000 Subject: [PATCH] Removendo modulos sem uso --- src/gtk/v3270/oia.c | 6 ++++-- src/gtk/v3270/v3270.h | 9 +++++++-- src/include/lib3270/config.h.in | 4 +--- src/lib3270/printer.c | 24 +++++++++++++++--------- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/gtk/v3270/oia.c b/src/gtk/v3270/oia.c index 9e974c9..8d253b1 100644 --- a/src/gtk/v3270/oia.c +++ b/src/gtk/v3270/oia.c @@ -478,12 +478,14 @@ void v3270_draw_oia(cairo_t *cr, H3270 *host, int row, int cols, struct v3270_me { V3270_OIA_TIMER, setup_timer_position }, { V3270_OIA_SPINNER, setup_spinner_position }, { V3270_OIA_LUNAME, setup_luname_position }, +#ifdef X3270_PRINTER { V3270_OIA_PRINTER, setup_single_char_right }, +#endif // X3270_PRINTER { V3270_OIA_SCRIPT, setup_single_char_right }, { V3270_OIA_INSERT, setup_insert_position }, { V3270_OIA_TYPEAHEAD, setup_single_char_right }, { V3270_OIA_SHIFT, setup_double_char_position }, - { V3270_OIA_CAPS, setup_single_char_right }, +// { V3270_OIA_CAPS, setup_single_char_right }, { V3270_OIA_ALT, setup_single_char_right }, { V3270_OIA_SSL, setup_double_char_position }, }; @@ -1011,7 +1013,7 @@ void v3270_update_oia(H3270 *session, LIB3270_FLAG id, unsigned char on) update_text_field(terminal,on,V3270_OIA_TYPEAHEAD,"T"); break; -#ifdef LIB3270_FLAG_PRINTER +#if defined(LIB3270_FLAG_PRINTER) && defined(X3270_PRINTER) case LIB3270_FLAG_PRINTER: update_text_field(terminal,on,V3270_OIA_PRINTER,"P"); break; diff --git a/src/gtk/v3270/v3270.h b/src/gtk/v3270/v3270.h index 3c1ad7e..d3b2115 100644 --- a/src/gtk/v3270/v3270.h +++ b/src/gtk/v3270/v3270.h @@ -31,6 +31,7 @@ #ifndef V3270_H_INCLUDED + #include #include #define V3270_H_INCLUDED 1 @@ -101,17 +102,21 @@ V3270_OIA_ALT, /**< Alt indication ("A" or blank) */ /**< Compose indication ("C" or blank) */ /**< Compose first character */ - V3270_OIA_CAPS, /**< Caps indication ("A" or blank) */ V3270_OIA_SHIFT, /**< Shift Status */ V3270_OIA_TYPEAHEAD, /**< Typeahead indication ("T" or blank) */ V3270_OIA_INSERT, /**< Insert mode indication (Special symbol/"I" or blank) */ V3270_OIA_SCRIPT, /**< Script indication ("S" or blank) */ - V3270_OIA_PRINTER, /**< Printer indication ("P" or blank) */ V3270_OIA_LUNAME, /**< LU Name */ V3270_OIA_SPINNER, /**< command timing spinner */ V3270_OIA_TIMER, /**< command timing (mmm:ss, or blank) */ V3270_OIA_CURSOR_POSITION, /**< cursor position (rrr/ccc or blank) */ +// V3270_OIA_CAPS, /**< Caps indication ("A" or blank) */ + +#ifdef X3270_PRINTER + V3270_OIA_PRINTER, /**< Printer indication ("P" or blank) */ +#endif // X3270_PRINTER + V3270_OIA_FIELD_COUNT } V3270_OIA_FIELD; diff --git a/src/include/lib3270/config.h.in b/src/include/lib3270/config.h.in index e22a026..5d3afc7 100644 --- a/src/include/lib3270/config.h.in +++ b/src/include/lib3270/config.h.in @@ -26,7 +26,6 @@ * erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) * licinio@bb.com.br (Licínio Luis Branco) * kraucer@bb.com.br (Kraucer Fernandes Mazuco) - * macmiranda@bb.com.br (Marco Aurélio Caldas Miranda) * */ @@ -52,9 +51,8 @@ #define X3270_ANSI #define X3270_APL #define X3270_FT - #define X3270_PRINTER + /* #define X3270_PRINTER */ - #undef HAVE_ALTSCREEN #undef HAVE_IGEMAC #undef HAVE_MACUI #undef HAVE_MALLOC_H diff --git a/src/lib3270/printer.c b/src/lib3270/printer.c index 78de4e4..1ead606 100644 --- a/src/lib3270/printer.c +++ b/src/lib3270/printer.c @@ -39,13 +39,18 @@ #include "globals.h" #if (defined(C3270) || defined(X3270_DISPLAY)) && defined(X3270_PRINTER) /*[*/ -#if defined(X3270_DISPLAY) /*[*/ + +/* +#if defined(X3270_DISPLAY) #include #include -#endif /*]*/ -#if defined(_WIN32) /*[*/ -#include "windows.h" -#endif /*]*/ +#endif +*/ + +#if defined(_WIN32) + #include "windows.h" +#endif + #include #include #include @@ -54,7 +59,6 @@ #include "appres.h" #include "objects.h" #include "resources.h" -// #include "ctlr.h" #include "charsetc.h" #include "ctlrc.h" @@ -63,9 +67,11 @@ #include "printerc.h" #include "printc.h" #include "savec.h" -#if defined(C3270) /*[*/ -#include "screenc.h" -#endif /*]*/ + +#if defined(C3270) + #include "screenc.h" +#endif + #include "tablesc.h" #include "telnetc.h" #include "trace_dsc.h" -- libgit2 0.21.2