WebSVN – Kolibri OS – Path Comparison – / – /programs/cmm/lib/obj Rev 5576 and /programs/cmm/lib/obj/ Rev 5598

Regard whitespace Rev 5576 → Rev 5598

 /programs/cmm/lib/obj/box_lib.h
 ,4 → 1,15
 //BOX_LIB - Asper
+#ifndef INCLUDE_BOX_LIB_H
+#define INCLUDE_BOX_LIB_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword boxlib = #aEdit_box_lib;
 char aEdit_box_lib[]="/sys/lib/box_lib.obj";
 ,4 → 180,6
         dword font_size_y;
         dword font_color;
         dword font_backgr_color;
-};
+};
+#endif

 /programs/cmm/lib/obj/http.h
 ,5 → 1,15
 //HTTP library
+#ifndef INCLUDE_LIBHTTP_H
+#define INCLUDE_LIBHTTP_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword libHTTP = #alibHTTP;
 char alibHTTP[23] = "/sys/lib/http.obj\0";
 ,4 → 75,6
 :dword file_get_contents(dword url,...)
 {
         http_get(url,FLAG_HTTP11,"");
-}
+}
+#endif

 /programs/cmm/lib/obj/iconv.h
 ,5 → 1,15
 //convert text characters
+#ifndef INCLUDE_LIBICONV_H
+#define INCLUDE_LIBICONV_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword iconv_lib = #a_iconv_lib;
 char a_iconv_lib[19]="/sys/lib/iconv.obj\0";
 ,4 → 66,6
         CH_CP1252,
         CH_ISO8859_5,
         CH_CP866
-};
+};
+#endif

 /programs/cmm/lib/obj/libimg_lib.h
 ,5 → 1,25
 //Asper
+#ifndef INCLUDE_LIBIMG_H
+#define INCLUDE_LIBIMG_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_MEM_H
+#include "../lib/mem.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
+#ifndef INCLUDE_LIBIO_H
+#include "../lib/obj/libio_lib.h"
+#endif
+:byte init_imglib_check;
 //library
 dword libimg = #alibimg;
 char alibimg[21] = "/sys/lib/libimg.obj\0";
 ,3 → 120,5
         $stc
         return 0;
 }
+#endif

 /programs/cmm/lib/obj/libini.h
 ,3 → 1,14
+#ifndef INCLUDE_LIBINI_H
+#define INCLUDE_LIBINI_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword libini = #alibini;
 char alibini[] = "/sys/lib/libini.obj";
 ,3 → 34,5
 //char aini_get_shortcut[] = "ini_get_shortcut";
 char aini_get_color[] = "ini_get_color";
 //char aini_set_color[] = "ini_set_color";
+#endif

 /programs/cmm/lib/obj/libio_lib.h
 ,5 → 1,15
 //Asper
+#ifndef INCLUDE_LIBIO_H
+#define INCLUDE_LIBIO_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 //library
 dword libio = #alibio;
 char alibio[21] = "/sys/lib/libio.obj\0"; //"libio.obj\0";
 ,3 → 42,5
 #define SEEK_SET  0
 #define SEEK_CUR  1
 #define SEEK_END  2
+#endif

 /programs/cmm/lib/obj/netcode.h
 ,5 → 1,14
 //Network library
+#ifndef INCLUDE_NETCODE_H
+#define INCLUDE_NETCODE_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword netcode_lib = #a_netcode_lib;
 char a_netcode_lib[21]="/sys/lib/netcode.obj\0";
 ,4 → 25,6
 Кодирование массива inp длиной len в массив outp (строку с '\0'). Функция возвращает длину outp.
 int base64_decode(char inp[], char outp[], int len);
-Декодирование массива inp длиной len в массив outp (строку с '\0'). Функция возвращает длину outp.*/
+Декодирование массива inp длиной len в массив outp (строку с '\0'). Функция возвращает длину outp.*/
+#endif

 /programs/cmm/lib/obj/network.h
 ,5 → 1,14
 //Network library
+#ifndef INCLUDE_NETWORK_H
+#define INCLUDE_NETWORK_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword network_lib = #a_network_lib;
 char a_network_lib[21]="/sys/lib/network.obj\0";
 ,3 → 70,5
     struct addrinfo *ai_next;
 };
 */
+#endif

 /programs/cmm/lib/obj/proc_lib.h
 ,3 → 1,13
+#ifndef INCLUDE_PROCLIB_H
+#define INCLUDE_PROCLIB_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword Proc_lib = #aProc_lib;
 char aProc_lib[]                 = "/sys/lib/proc_lib.obj";
 ,3 → 41,4
   word y_start;
 };
+#endif

 /programs/cmm/lib/obj/truetype.h
 ,5 → 1,14
 // Truetype library
+#ifndef INCLUDE_LIBTRUETYPE_H
+#define INCLUDE_LIBTRUETYPE_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword libtruetype = #att_libtruetype;
 char att_libtruetype[22] = "/sys/lib/truetype.obj\0";
 ,3 → 44,5
         int index_map;                     // a cmap mapping for our chosen character encoding
         int indexToLocFormat;              // format needed to map from glyph index to glyph
 };
+#endif

 /programs/cmm/lib/obj/xml.h
 ,3 → 1,13
+#ifndef INCLUDE_LIBXML_H
+#define INCLUDE_LIBXML_H
+#ifndef INCLUDE_KOLIBRI_H
+#include "../lib/kolibri.h"
+#endif
+#ifndef INCLUDE_DLL_H
+#include "../lib/dll.h"
+#endif
 dword XML = #aXML_lib;
 char aXML_lib[]               = "/sys/lib/xml.obj";
 ,4 → 133,6
   dword strict;                 // (int)
   dword reserved1;              // (int)
   AXElement reserved2;          // (AXElement)
-};
+};
+#endif