Updates to support SDCC 3.1.4+ new build-in defines.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/ulut/ul_gavl.h b/ulut/ul_gavl.h
index d21d07653a73f6ca627d50feee30e0fce55cf766..d27f812b97eb26c5cde956ba4dcecd1a149856db 100644 (file)
--- a/ulut/ul_gavl.h
+++ b/ulut/ul_gavl.h
@@ -101,7 +101,7 @@ gavl_next_node(const gavl_node_t *node);
 gavl_node_t *
 gavl_prev_node(const gavl_node_t *node);
 
-#ifndef SDCC
+#if !defined(SDCC) && !defined(__SDCC)
 
 int
 gavl_is_empty(const gavl_root_t *root);
@@ -251,7 +251,7 @@ gavl_delete_and_next_node(gavl_root_t *root, gavl_node_t *node);
 /*===========================================================*/
 /* iterators for generic GAVL type */
 
-#ifndef SDCC
+#if !defined(SDCC) && !defined(__SDCC)
 
 typedef struct {
   gavl_root_t *container;

diff --git a/ulut/ul_gavlchk.c b/ulut/ul_gavlchk.c
index 43f01ea4ba7d55d0770ab68d5bc4226c3690087b..bb67226655b14c46a067e8d3759aee29657ae1fc 100644 (file)
--- a/ulut/ul_gavlchk.c
+++ b/ulut/ul_gavlchk.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#ifndef SDCC
+#if !defined(SDCC) && !defined(__SDCC)
 #include <sys/time.h>
 #endif
 

diff --git a/ulut/ul_gavlprim.c b/ulut/ul_gavlprim.c
index 8880be36479fd8f400e5d0058e3c4d6ef2e6b96e..491ecd7b9f37fcb46e602246b0c162475487f21b 100644 (file)
--- a/ulut/ul_gavlprim.c
+++ b/ulut/ul_gavlprim.c
@@ -77,7 +77,7 @@ gavl_prev_node(const gavl_node_t *node)
   }
 }
 
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 #pragma save
 #pragma nogcse
 #endif /*SDCC*/
@@ -217,7 +217,7 @@ gavl_balance_one(gavl_node_t **subtree)
   /*printf("#%d",ret);*/
   return(ret);
 }
-#ifdef SDCC
+#if defined(SDCC) || defined(__SDCC)
 #pragma restore
 #endif /*SDCC*/
 

diff --git a/ulut/ul_hashtabchk.c b/ulut/ul_hashtabchk.c
index 3918b3ab6e2ac3bb774b94c248c999229e730b81..3312fd0bc850cf20445788ac01782c620e2b2a22 100644 (file)
--- a/ulut/ul_hashtabchk.c
+++ b/ulut/ul_hashtabchk.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#ifndef SDCC
+#if !defined(SDCC) && !defined(__SDCC)
 #include <sys/time.h>
 #endif
 
@@ -238,4 +238,4 @@ int main(int argc, char *argv[])
   free(item_arr);
 
   return 0;
-}
\ No newline at end of file
+}

diff --git a/ulut/ul_logbase.c b/ulut/ul_logbase.c
index 5626d69b58f5dab74fce43ecf37979c27efe3099..d3115342f833f305d28a2ac7d6ba10845491340e 100644 (file)
--- a/ulut/ul_logbase.c
+++ b/ulut/ul_logbase.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#ifndef SDCC
+#if !defined(SDCC) && !defined(__SDCC)
 #include <sys/types.h>
 #endif
 #include <stdarg.h>
@@ -83,7 +83,7 @@ ul_log_fnc_default(ul_log_domain_t *domain, int level,
        const char *format, va_list ap) UL_ATTR_REENTRANT;
 
 ul_log_fnc_t *ul_log_output;
-#if !defined(__RTL__) && !defined(SDCC)
+#if !defined(__RTL__) && !defined(SDCC) && !defined(__SDCC)
 FILE *ul_log_default_file;
 #endif /*__RTL__*/
 
@@ -141,7 +141,7 @@ ul_log_redir(ul_log_fnc_t *log_fnc, int add_flags)
   ul_log_output=log_fnc;
 }
 
-#if !defined(__RTL__) && !defined(SDCC)
+#if !defined(__RTL__) && !defined(SDCC) && !defined(__SDCC)
 void
 ul_log_fnc_default(ul_log_domain_t *domain, int level,
        const char *format, va_list ap)
@@ -178,7 +178,7 @@ ul_log_fnc_default(ul_log_domain_t *domain, int level,
 int
 ul_log_check_default_output(void)
 {
- #if !defined(__RTL__) && !defined(SDCC)
+ #if !defined(__RTL__) && !defined(SDCC) && !defined(__SDCC)
   char *s;
   char *log_fname;
  #endif /*__RTL__*/
@@ -187,7 +187,7 @@ ul_log_check_default_output(void)
     return 0;
 
   ul_log_output=ul_log_fnc_default;
- #if !defined(__RTL__) && !defined(SDCC)
+ #if !defined(__RTL__) && !defined(SDCC) && !defined(__SDCC)
   if((log_fname=getenv("UL_LOG_FILENAME"))!=NULL){
     ul_log_default_file=fopen(log_fname,"a");
   }

diff --git a/ulut/ul_utdefs.h b/ulut/ul_utdefs.h
index 0b2e4d7ef97ac002b42b67b2aff1583826b69c03..0f45a03612d1a434c408580bd951c5d4a0a4ab4a 100644 (file)
--- a/ulut/ul_utdefs.h
+++ b/ulut/ul_utdefs.h
@@ -107,7 +107,7 @@ extern "C" {
 #endif /* !__GNUC__ */
 
 #ifndef UL_ATTR_REENTRANT
-#if !defined(SDCC) || defined(SDCC_z80)
+#if (!defined(SDCC) && !defined(__SDCC)) || defined(SDCC_z80) || defined(__SDCC_z80)
   #define UL_ATTR_REENTRANT
 #else
   #define UL_ATTR_REENTRANT __reentrant