From f0298d3d9d26fae2e1689df68fa06b812660832f Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 10 May 2012 19:39:05 +0000 Subject: [PATCH] Ajustes para construção da jni android --- glue.c | 10 ---------- sf.c | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/glue.c b/glue.c index ed33a87..fad50a9 100644 --- a/glue.c +++ b/glue.c @@ -105,8 +105,6 @@ int children = 0; Boolean exiting = False; // char * command_string = CN; - static Boolean sfont = False; - Boolean * standard_font = &sfont; #if defined(WC3270) || defined(LIB3270)/*[*/ char *profile_name = CN; @@ -787,14 +785,6 @@ read_resource_file(const char *filename, Boolean fatal) return 0; } -/* Screen globals. */ - -static int cw = 7; -int *char_width = &cw; - -static int ch = 7; -int *char_height = &ch; - // Boolean flipped = False; /* Replacements for functions in popups.c. */ diff --git a/sf.c b/sf.c index 05dcab5..5599693 100644 --- a/sf.c +++ b/sf.c @@ -64,12 +64,23 @@ #include "api.h" -/* Externals: ctlr.c */ -// extern Boolean screen_alt; +// Externals extern unsigned char reply_mode; extern int crm_nattr; extern unsigned char crm_attr[]; +/* Screen globals. */ +static int cw = 7; +int * char_width = &cw; + +static int ch = 7; +int * char_height = &ch; + +/* Globals */ +static Boolean sfont = False; +Boolean * standard_font = &sfont; + + /* Statics */ static Boolean qr_in_progress = False; static enum pds sf_read_part(unsigned char buf[], unsigned buflen); -- libgit2 0.21.2