From 43e8b4dc26336e2bf5550ce7a23c07de09b3dad7 Mon Sep 17 00:00:00 2001 From: Asper Date: Fri, 26 Jul 2013 14:41:31 +0000 Subject: [PATCH] CMM - a better terminator for libraries import tables git-svn-id: svn://kolibrios.org@3839 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/lib/lib.obj/box_lib.h | 4 +--- programs/cmm/lib/lib.obj/iconv.h | 4 +--- programs/cmm/lib/lib.obj/libimg_lib.h | 4 +--- programs/cmm/lib/lib.obj/libio_lib.h | 4 +--- programs/cmm/lib/lib.obj/netcode.h | 4 +--- programs/cmm/lib/lib.obj/network.h | 8 +------- programs/cmm/lib/lib.obj/truetype.h | 4 +--- 7 files changed, 7 insertions(+), 25 deletions(-) diff --git a/programs/cmm/lib/lib.obj/box_lib.h b/programs/cmm/lib/lib.obj/box_lib.h index 02d6ad80bf..3520024d6d 100644 --- a/programs/cmm/lib/lib.obj/box_lib.h +++ b/programs/cmm/lib/lib.obj/box_lib.h @@ -17,9 +17,7 @@ dword version_scrollbar = #aVersion_scrollbar; dword PathShow_prepare = #aPathShow_prepare; dword PathShow_draw = #aPathShow_draw; - -dword am__ = 0x0; -dword bm__ = 0x0; +$DD 2 dup 0 char aEdit_box_draw [9] = "edit_box\0"; char aEdit_box_key [13] = "edit_box_key\0"; diff --git a/programs/cmm/lib/lib.obj/iconv.h b/programs/cmm/lib/lib.obj/iconv.h index 399a3c754c..39f3681603 100644 --- a/programs/cmm/lib/lib.obj/iconv.h +++ b/programs/cmm/lib/lib.obj/iconv.h @@ -5,9 +5,7 @@ char a_iconv_lib[19]="/sys/lib/iconv.obj\0"; dword iconv_open = #aIconv_open; dword iconv = #aIconv; - -dword am5__ = 0x0; -dword bm5__ = 0x0; +$DD 2 dup 0 char aIconv_open[11] = "iconv_open\0"; char aIconv[6] = "iconv\0"; diff --git a/programs/cmm/lib/lib.obj/libimg_lib.h b/programs/cmm/lib/lib.obj/libimg_lib.h index f9650b3eeb..ec22b73d8a 100644 --- a/programs/cmm/lib/lib.obj/libimg_lib.h +++ b/programs/cmm/lib/lib.obj/libimg_lib.h @@ -12,9 +12,7 @@ dword img_destroy = #aimg_destroy; dword img_draw = #aimg_draw; //dword img_flip = #aimg_flip; //dword img_rotate = #aimg_rotate; - -dword am1__ = 0x0; -dword bm1__ = 0x0; +$DD 2 dup 0 //import libimg , \ char alibimg_init[9] = "lib_init\0"; diff --git a/programs/cmm/lib/lib.obj/libio_lib.h b/programs/cmm/lib/lib.obj/libio_lib.h index 1ef15c7b45..5af34f94a3 100644 --- a/programs/cmm/lib/lib.obj/libio_lib.h +++ b/programs/cmm/lib/lib.obj/libio_lib.h @@ -9,9 +9,7 @@ dword file_size = #afile_size; dword file_open = #afile_open; dword file_read = #afile_read; dword file_close = #afile_close; - -dword am2__ = 0x0; -dword bm2__ = 0x0; +$DD 2 dup 0 //import libio , \ diff --git a/programs/cmm/lib/lib.obj/netcode.h b/programs/cmm/lib/lib.obj/netcode.h index 5e39355893..8a1383955c 100644 --- a/programs/cmm/lib/lib.obj/netcode.h +++ b/programs/cmm/lib/lib.obj/netcode.h @@ -6,9 +6,7 @@ char a_netcode_lib[21]="/sys/lib/netcode.obj\0"; dword base64_encode = #aBase64_encode; dword base64_decode = #aBase64_decode; dword qp_decode = #aQp_decode; - -dword am4__ = 0x0; -dword bm4__ = 0x0; +$DD 2 dup 0 char aBase64_encode[14] = "base64_encode\0"; char aBase64_decode[14] = "base64_decode\0"; diff --git a/programs/cmm/lib/lib.obj/network.h b/programs/cmm/lib/lib.obj/network.h index a25d73af96..df58bae298 100644 --- a/programs/cmm/lib/lib.obj/network.h +++ b/programs/cmm/lib/lib.obj/network.h @@ -11,13 +11,7 @@ dword getaddrinfo_start = #aGetaddrinfo_start; dword getaddrinfo_process = #aGetaddrinfo_process; dword getaddrinfo_abort = #aGetaddrinfo_abort; dword freeaddrinfo = #aFreeaddrinfo; - -#ifndef am3__ -dword am3__ = 0x0; -#endif -#ifndef bm3__ -dword bm3__ = 0x0; -#endif +$DD 2 dup 0 char aLib_init[9] = "lib_init\0"; char aInet_addr[10] = "inet_addr\0"; diff --git a/programs/cmm/lib/lib.obj/truetype.h b/programs/cmm/lib/lib.obj/truetype.h index 5d8c3057fd..fe2529d4de 100644 --- a/programs/cmm/lib/lib.obj/truetype.h +++ b/programs/cmm/lib/lib.obj/truetype.h @@ -11,9 +11,7 @@ dword get_length = #att_get_length; dword get_width = #att_get_width; dword text_out = #att_text_out; dword init_font = #att_init_font; - -dword am3__ = 0x0; -dword bm3__ = 0x0; +$DD 2 dup 0 //import libimg , \