Merge pull request #4755 from WalterBright/renSC

rename __SC__ to __DMC__
dlang · Jun 20, 2015 · 1dc0bc3 · 1dc0bc3
2 parents 2f1b85a + cb641c5
commit 1dc0bc3
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 16 deletions.
diff --git a/src/backend/cc.h b/src/backend/cc.h
@@ -9,7 +9,7 @@
  * For any other uses, please contact Digital Mars.
  */
 
-#if __SC__
+#if __DMC__
 #pragma once
 #endif
 
@@ -352,7 +352,7 @@ extern Cstate cstate;
 //  done on it, so it is stack and register variables.)
 #define symbol_isintab(s)       (sytab[(s)->Sclass] & SCSS)
 
-#if defined(__SC__) || defined(_MSC_VER)
+#if defined(__DMC__) || defined(_MSC_VER)
 typedef char enum_SC;
 #else
 typedef enum SC enum_SC;

diff --git a/src/backend/cdef.h b/src/backend/cdef.h
@@ -13,7 +13,6 @@
 /* Macros defined by the compiler, not the code:
 
     Compiler:
-        __SC__          Symantec compiler
         __DMC__         Digital Mars compiler
         _MSC_VER        Microsoft compiler
         __GNUC__        Gnu compiler

diff --git a/src/backend/cdeflnx.h b/src/backend/cdeflnx.h
@@ -14,7 +14,7 @@
 #define M_UNIX 1
 #define MEMMODELS 1
 #if __GNUC__
-#define __SC__ 0
+#define __DMC__ 0
 #define _MSC_VER 0
 #endif
 

diff --git a/src/backend/cgen.c b/src/backend/cgen.c
@@ -92,7 +92,7 @@ code *setOpcode(code *c, code *cs, unsigned op)
  * Concatenate two code lists together. Return pointer to result.
  */
 
-#if TX86 && __INTSIZE == 4 && __SC__
+#if TX86 && __INTSIZE == 4 && __DMC__
 __declspec(naked) code * __pascal cat(code *c1,code *c2)
 {
     _asm

diff --git a/src/backend/el.c b/src/backend/el.c
@@ -2598,9 +2598,9 @@ int el_match(elem *n1,elem *n2)
                     case TYulong4:
                     case TYllong2:
                     case TYullong2:
-                        if(n1->EV.Vcent.msw != n2->EV.Vcent.msw || n1->EV.Vcent.lsw != n2->EV.Vcent.lsw)
-			                goto nomatch;
-			            break;
+                        if (n1->EV.Vcent.msw != n2->EV.Vcent.msw || n1->EV.Vcent.lsw != n2->EV.Vcent.lsw)
+                            goto nomatch;
+                        break;
                     case TYcldouble:
 #if LNGDBLSIZE > 10
                         /* sizeof is 12, but actual size of each part is 10 */

diff --git a/src/backend/el.h b/src/backend/el.h
@@ -11,7 +11,7 @@
 
 /* Routines to handle elems.                            */
 
-#if __SC__
+#if __DMC__
 #pragma once
 #endif
 

diff --git a/src/backend/evalu8.c b/src/backend/evalu8.c
@@ -1646,7 +1646,7 @@ elem * evalu8(elem *e, goal_t goal)
                 break;
             case TYfloat:
             case TYifloat:
-#if __SC__
+#if __DMC__
                 e->EV.Vfloat = fabsf(e1->EV.Vfloat);
 #else
                 e->EV.Vfloat = fabs(e1->EV.Vfloat);

diff --git a/src/backend/global.h b/src/backend/global.h
@@ -161,7 +161,7 @@ char *unsstr(unsigned);
 int isignore(int);
 int isillegal(int);
 
-#if !defined(__SC__) && !defined(_MSC_VER)
+#if !defined(__DMC__) && !defined(_MSC_VER)
 int ishex(int);
 #endif
 

diff --git a/src/backend/go.h b/src/backend/go.h
@@ -9,7 +9,7 @@
  * For any other uses, please contact Digital Mars.
  */
 
-#if __SC__
+#if __DMC__
 #pragma once
 #endif
 

diff --git a/src/backend/oper.h b/src/backend/oper.h
@@ -10,7 +10,7 @@
  */
 
 
-#if __SC__
+#if __DMC__
 #pragma once
 #endif
 

diff --git a/src/backend/ty.h b/src/backend/ty.h
@@ -10,7 +10,7 @@
  */
 
 
-#if __SC__
+#if __DMC__
 #pragma once
 #endif
 

diff --git a/src/backend/type.h b/src/backend/type.h
@@ -9,7 +9,7 @@
  * For any other uses, please contact Digital Mars.
  */
 
-#if __SC__
+#if __DMC__
 #pragma once
 #endif
 

diff --git a/src/backend/var.c b/src/backend/var.c
@@ -28,7 +28,7 @@
 #include        "optab.c"
 #include        "tytab.c"
 
-#if __SC__ && _MSDOS
+#if __DMC__ && _MSDOS
 unsigned __cdecl _stack = 100000;       // set default stack size
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
      */
-    #if __SC__
+    #if __DMC__
     #pragma once
     #endif
@@ Expand Down @@