Commit 6224c578280804034fd79d3004e27cbe7180dfa3
1 parent
e93dc0f1
Exists in
master
and in
5 other branches
Ajustes para construção da jni android
Showing
2 changed files
with
13 additions
and
12 deletions
Show diff stats
src/lib3270/glue.c
| ... | ... | @@ -105,8 +105,6 @@ |
| 105 | 105 | int children = 0; |
| 106 | 106 | Boolean exiting = False; |
| 107 | 107 | // char * command_string = CN; |
| 108 | - static Boolean sfont = False; | |
| 109 | - Boolean * standard_font = &sfont; | |
| 110 | 108 | |
| 111 | 109 | #if defined(WC3270) || defined(LIB3270)/*[*/ |
| 112 | 110 | char *profile_name = CN; |
| ... | ... | @@ -787,14 +785,6 @@ read_resource_file(const char *filename, Boolean fatal) |
| 787 | 785 | return 0; |
| 788 | 786 | } |
| 789 | 787 | |
| 790 | -/* Screen globals. */ | |
| 791 | - | |
| 792 | -static int cw = 7; | |
| 793 | -int *char_width = &cw; | |
| 794 | - | |
| 795 | -static int ch = 7; | |
| 796 | -int *char_height = &ch; | |
| 797 | - | |
| 798 | 788 | // Boolean flipped = False; |
| 799 | 789 | |
| 800 | 790 | /* Replacements for functions in popups.c. */ | ... | ... |
src/lib3270/sf.c
| ... | ... | @@ -64,12 +64,23 @@ |
| 64 | 64 | |
| 65 | 65 | #include "api.h" |
| 66 | 66 | |
| 67 | -/* Externals: ctlr.c */ | |
| 68 | -// extern Boolean screen_alt; | |
| 67 | +// Externals | |
| 69 | 68 | extern unsigned char reply_mode; |
| 70 | 69 | extern int crm_nattr; |
| 71 | 70 | extern unsigned char crm_attr[]; |
| 72 | 71 | |
| 72 | +/* Screen globals. */ | |
| 73 | +static int cw = 7; | |
| 74 | +int * char_width = &cw; | |
| 75 | + | |
| 76 | +static int ch = 7; | |
| 77 | +int * char_height = &ch; | |
| 78 | + | |
| 79 | +/* Globals */ | |
| 80 | +static Boolean sfont = False; | |
| 81 | +Boolean * standard_font = &sfont; | |
| 82 | + | |
| 83 | + | |
| 73 | 84 | /* Statics */ |
| 74 | 85 | static Boolean qr_in_progress = False; |
| 75 | 86 | static enum pds sf_read_part(unsigned char buf[], unsigned buflen); | ... | ... |