Browse Source

Use CPUMIPS instead of MIPS conditional

git-svn-id: trunk@21806 -
pierre 13 years ago
parent
commit
32644a526c
1 changed files with 23 additions and 23 deletions
  1. 23 23
      rtl/linux/ptypes.inc

+ 23 - 23
rtl/linux/ptypes.inc

@@ -30,7 +30,7 @@ and all three 32-bit systems returned completely identical types too
 introduction)
 introduction)
 }
 }
 
 
-{$ifdef MIPS}
+{$ifdef CPUMIPS}
 {$define USE_PTHREAD_SIZEOF}
 {$define USE_PTHREAD_SIZEOF}
 {$ifdef CPU64}
 {$ifdef CPU64}
 const
 const
@@ -217,7 +217,7 @@ Type
     __sched_priority: cint;
     __sched_priority: cint;
   end;
   end;
 
 
-  { MIPS32 size of unions   
+  { MIPS32 size of unions
   __SIZEOF_PTHREAD_ATTR_T = 36;
   __SIZEOF_PTHREAD_ATTR_T = 36;
   __SIZEOF_PTHREAD_MUTEX_T = 24;
   __SIZEOF_PTHREAD_MUTEX_T = 24;
   __SIZEOF_PTHREAD_MUTEXATTR_T = 4;
   __SIZEOF_PTHREAD_MUTEXATTR_T = 4;
@@ -230,13 +230,13 @@ Type
 
 
   pthread_attr_t = record
   pthread_attr_t = record
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
-  case byte of 
+  case byte of
    0 : (
    0 : (
     	 __size : array[0..__SIZEOF_PTHREAD_ATTR_T-1] of char;
     	 __size : array[0..__SIZEOF_PTHREAD_ATTR_T-1] of char;
     	 __align : clong;
     	 __align : clong;
        );
        );
   1 : (
   1 : (
-  {$endif}    	  
+  {$endif}    	
     __detachstate: cint;
     __detachstate: cint;
     __schedpolicy: cint;
     __schedpolicy: cint;
     __schedparam: sched_param;
     __schedparam: sched_param;
@@ -248,7 +248,7 @@ Type
     __stacksize: size_t;
     __stacksize: size_t;
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
        );
        );
-  {$endif}    	  
+  {$endif}    	
   end;
   end;
 
 
   _pthread_fastlock = record
   _pthread_fastlock = record
@@ -258,13 +258,13 @@ Type
 
 
   pthread_mutex_t = record
   pthread_mutex_t = record
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
-  case byte of 
+  case byte of
    0 : (
    0 : (
     	 __size : array[0..__SIZEOF_PTHREAD_MUTEX_T-1] of char;
     	 __size : array[0..__SIZEOF_PTHREAD_MUTEX_T-1] of char;
     	 __align : clong;
     	 __align : clong;
        );
        );
   1 : (
   1 : (
-  {$endif}    	  
+  {$endif}    	
     __m_reserved: cint;
     __m_reserved: cint;
     __m_count: cint;
     __m_count: cint;
     __m_owner: pointer;
     __m_owner: pointer;
@@ -272,55 +272,55 @@ Type
     __m_lock: _pthread_fastlock;
     __m_lock: _pthread_fastlock;
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
        );
        );
-  {$endif}    	  
+  {$endif}    	
   end;
   end;
 
 
   pthread_mutexattr_t = record
   pthread_mutexattr_t = record
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
-  case byte of 
+  case byte of
    0 : (
    0 : (
     	 __size : array[0..__SIZEOF_PTHREAD_MUTEXATTR_T-1] of char;
     	 __size : array[0..__SIZEOF_PTHREAD_MUTEXATTR_T-1] of char;
     	 __align : clong;
     	 __align : clong;
        );
        );
   1 : (
   1 : (
-  {$endif}    	  
+  {$endif}    	
     __mutexkind: cint;
     __mutexkind: cint;
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
        );
        );
-  {$endif}    	  
+  {$endif}    	
   end;
   end;
 
 
   pthread_cond_t = record
   pthread_cond_t = record
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
-  case byte of 
+  case byte of
    0 : (
    0 : (
     	 __size : array[0..__SIZEOF_PTHREAD_COND_T-1] of char;
     	 __size : array[0..__SIZEOF_PTHREAD_COND_T-1] of char;
     	 ___align : clong;
     	 ___align : clong;
        );
        );
   1 : (
   1 : (
-  {$endif}    	  
+  {$endif}    	
     __c_lock: _pthread_fastlock;
     __c_lock: _pthread_fastlock;
     __c_waiting: pointer;
     __c_waiting: pointer;
     __padding: array[0..48-1-sizeof(_pthread_fastlock)-sizeof(pointer)-sizeof(clonglong)] of byte;
     __padding: array[0..48-1-sizeof(_pthread_fastlock)-sizeof(pointer)-sizeof(clonglong)] of byte;
     __align: clonglong;
     __align: clonglong;
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
        );
        );
-  {$endif}    	  
+  {$endif}    	
   end;
   end;
 
 
   pthread_condattr_t = record
   pthread_condattr_t = record
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
-  case byte of 
+  case byte of
    0 : (
    0 : (
          __size : array[0..__SIZEOF_PTHREAD_CONDATTR_T-1] of char;
          __size : array[0..__SIZEOF_PTHREAD_CONDATTR_T-1] of char;
          __align : clong;
          __align : clong;
        );
        );
   1 : (
   1 : (
-  {$endif}    	  
+  {$endif}    	
     __dummy: cint;
     __dummy: cint;
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
        );
        );
-  {$endif}    	  
+  {$endif}    	
   end;
   end;
 
 
   pthread_key_t = cuint;
   pthread_key_t = cuint;
@@ -332,34 +332,34 @@ type
 
 
   pthread_rwlock_t = record // should be 56 for 64-bit, 32 bytes for 32-bit mantis #21552
   pthread_rwlock_t = record // should be 56 for 64-bit, 32 bytes for 32-bit mantis #21552
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
-  case byte of 
+  case byte of
    0 : (
    0 : (
     	 __size : array[0..__SIZEOF_PTHREAD_RWLOCK_T-1] of char;
     	 __size : array[0..__SIZEOF_PTHREAD_RWLOCK_T-1] of char;
     	 __align : clong;
     	 __align : clong;
        );
        );
   1 : (
   1 : (
-  {$endif}    	  
+  {$endif}    	
     		case boolean of
     		case boolean of
     		 false : (_data : array[0..pthreadrwlocksize-1] of char);
     		 false : (_data : array[0..pthreadrwlocksize-1] of char);
     	         true  : (align : clong);
     	         true  : (align : clong);
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
        );
        );
-  {$endif}    	  
+  {$endif}    	
   end;
   end;
   pthread_rwlockattr_t = record
   pthread_rwlockattr_t = record
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
-  case byte of 
+  case byte of
    0 : (
    0 : (
     	 __size : array[0..__SIZEOF_PTHREAD_RWLOCKATTR_T-1] of char;
     	 __size : array[0..__SIZEOF_PTHREAD_RWLOCKATTR_T-1] of char;
     	 __align : clong;
     	 __align : clong;
        );
        );
   1 : (
   1 : (
-  {$endif}    	  
+  {$endif}    	
     __lockkind: cint;
     __lockkind: cint;
     __pshared: cint;
     __pshared: cint;
   {$ifdef USE_PTHREAD_SIZEOF}
   {$ifdef USE_PTHREAD_SIZEOF}
        );
        );
-  {$endif}    	  
+  {$endif}    	
   end;
   end;
 
 
   sem_t = record
   sem_t = record