Browse Source

Merge branch 'ComposersDesktop:main' into aaio-relicense

enkvadrat 1 month ago
parent
commit
9a68746e8e
3 changed files with 7 additions and 4 deletions
  1. 2 1
      dev/externals/mctools/chxformat.c
  2. 2 1
      dev/externals/portsf/portsf.c
  3. 3 2
      dev/newsfsys/sfsys.c

+ 2 - 1
dev/externals/mctools/chxformat.c

@@ -41,7 +41,8 @@ char* guidnames[] = {"PCM","PCM FLOAT","AMB PCM","AMB FLOAT"};
 #define REVWBYTES(t)    ( (((t)&0xff) << 8) | (((t)>>8) &0xff) )
 #define TAG(a,b,c,d)    ( ((a)<<24) | ((b)<<16) | ((c)<<8) | (d) )
 
-#ifdef linux
+//#ifdef linux
+#ifdef __GLIBC__
 #define POS64(x) (x.__pos)
 #else
 #define POS64(x) (x)

+ 2 - 1
dev/externals/portsf/portsf.c

@@ -90,7 +90,8 @@ int stricmp(const char *a, const char *b);
 int strnicmp(const char *a, const char *b, const int length);
 #endif
 
-#ifdef linux
+//#ifdef linux
+#ifdef __GLIBC__
 #define POS64(x) (x.__pos)
 #else
 #define POS64(x) (x)

+ 3 - 2
dev/newsfsys/sfsys.c

@@ -280,7 +280,8 @@ extern int sampsize[];
 #define sizeof_WFMTEX (40)
 
 
-#ifdef linux
+//#ifdef linux
+#ifdef __GLIBC__
 #define POS64(x) (x.__pos)
 #else
 #define POS64(x) (x)
@@ -6797,7 +6798,7 @@ static int asm_round(double fval)
     return (long) result;
 }
 #endif
-//RFWD don't need this any more. "Deprecated".    
+//RWD don't need this any more. "Deprecated".    
 int cdp_round(double fval)
 {
     return lround(fval);