ALT Linux repos
Group :: System/Libraries
RPM: libmikmod
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: libmikmod-3.3.7-mcst-e2k.patch
Download
Download
diff -Naur libmikmod-3.3.7-orig/include/mikmod.h libmikmod-3.3.7/include/mikmod.h
--- libmikmod-3.3.7-orig/include/mikmod.h 2014-07-15 11:50:00.000000000 +0400
+++ libmikmod-3.3.7/include/mikmod.h 2016-01-01 08:54:47.265523936 +0300
@@ -134,12 +134,15 @@
#endif
/* 2 bytes, signed and unsigned: */
-#ifndef __LCC__
+
+// borisov_av: конфликт макросов "Local C compiler" и нашего LCC
+//
+//#ifndef __LCC__
typedef signed short int SWORD;
-#endif
-#if !(defined(__LCC__) || defined(_MIKMOD_AMIGA))
+//#endif
+//#if !(defined(__LCC__) || defined(_MIKMOD_AMIGA))
typedef unsigned short int UWORD;
-#endif
+//#endif
/* 4 bytes, signed and unsigned: */
#if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)