From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 25 Jul 2015 10:26:05 +0000 (+0200)
Subject: Remove borland-compiler related cruft
X-Git-Tag: v3_12~412
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8614314e15433c18f67638fdcb519a12608e49c2?hp=9d1b149fe85f584e8c7e03f0d2a807b87d8711fd

Remove borland-compiler related cruft

- there is no way that simgrid still compiles with that compiler
- I'm not even sure that this tool still exists :)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e280cd8a12..a7266ebbe0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,8 +216,6 @@ if(WIN32)
     if(COMPILER_C_MINOR_VERSION)
       # set(__GNUC_MINOR__ ${COMPILER_C_MINOR_VERSION})
     endif()
-    set(MSVC 0)
-    set(BORLAND 0)
   else()
     message(FATAL_ERROR "Please use MinGW to compile SimGrid!")
   endif()
@@ -247,8 +245,6 @@ if(WIN32)
   message(STATUS "CMAKE_BUILD_TOOL              ${CMAKE_BUILD_TOOL}")
   message(STATUS "LINKER                        ${CMAKE_LINKER}")
   message(STATUS "CMAKE_GENERATOR               ${CMAKE_GENERATOR}")
-  message(STATUS "BORLAND                       ${BORLAND}")
-  message(STATUS "VISUALC                       ${MSVC}")
   message(STATUS "GNUC                          ${CMAKE_COMPILER_IS_GNUCC}")
 
 endif()
diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in
index 45d389d305..5265002d00 100644
--- a/include/simgrid_config.h.in
+++ b/include/simgrid_config.h.in
@@ -52,7 +52,6 @@
 #cmakedefine _WIN32 @_WIN32@			/*this variable is set if it is a 32 bits windows platform*/
 #cmakedefine _WIN64 @_WIN64@			/*this variable is set if it is a 64 bits  windows platform*/
 #cmakedefine __VISUALC__ @__VISUALC__@
-#cmakedefine __BORLANDC__ @__BORLANDC__@
 #ifdef _XBT_WIN32
 	#ifndef __GNUC__
 		#cmakedefine __GNUC__ @__GNUC__@
diff --git a/include/xbt/base.h b/include/xbt/base.h
index 7e8ad78b7b..e925011814 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -64,8 +64,6 @@
 #        define XBT_INLINE inline
 #    elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 #        define XBT_INLINE inline
-#    elif defined(__BORLANDC__) && !defined(__STRICT_ANSI__)
-#        define XBT_INLINE __inline
 #    else
 #        define XBT_INLINE
 #    endif
diff --git a/src/xbt/backtrace_windows.c b/src/xbt/backtrace_windows.c
index 0953a8d143..5414fc2314 100644
--- a/src/xbt/backtrace_windows.c
+++ b/src/xbt/backtrace_windows.c
@@ -12,7 +12,7 @@
  *  support for application self-debugging.
  */
 
-#if defined(_XBT_BORLAND_COMPILER) || defined(_XBT_VISUALC_COMPILER)
+#if defined(_XBT_VISUALC_COMPILER)
 /* native windows build */
 #  include <dbghelp.h>
 #else
diff --git a/src/xbt/xbt_strbuff.c b/src/xbt/xbt_strbuff.c
index e52a575b2b..12045e9d50 100644
--- a/src/xbt/xbt_strbuff.c
+++ b/src/xbt/xbt_strbuff.c
@@ -6,11 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-/* specific to Borland Compiler */
-#ifdef __BORLANDDC__
-#pragma hdrstop
-#endif
-
 #include "xbt/strbuff.h"
 
 #define minimal_increment 512
diff --git a/teshsuite/surf/lmm_usage/lmm_usage.c b/teshsuite/surf/lmm_usage/lmm_usage.c
index 060ed25cec..80cb82544f 100644
--- a/teshsuite/surf/lmm_usage/lmm_usage.c
+++ b/teshsuite/surf/lmm_usage/lmm_usage.c
@@ -6,10 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include "xbt/sysdep.h"
 #include "surf/maxmin.h"
 #include "xbt/log.h"
@@ -470,10 +466,6 @@ void test3(method_t method)
   xbt_free(A);
 }
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
 int main(int argc, char **argv)
 {
   xbt_init(&argc, argv);
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.c b/teshsuite/surf/maxmin_bench/maxmin_bench.c
index 8e7d2b0fad..f6094e697b 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench.c
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench.c
@@ -6,11 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-
 #include "surf/maxmin.h"
 #include "xbt/module.h"
 #include "xbt/xbt_os_time.h"
@@ -76,11 +71,6 @@ void test(int nb_cnst, int nb_var, int nb_elem)
   free(used);
 }
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
-
 int main(int argc, char **argv)
 {
   int nb_cnst = 2000;
diff --git a/teshsuite/surf/surf_usage/surf_usage.c b/teshsuite/surf/surf_usage/surf_usage.c
index 46fbbbd6bf..a2766379ec 100644
--- a/teshsuite/surf/surf_usage/surf_usage.c
+++ b/teshsuite/surf/surf_usage/surf_usage.c
@@ -6,10 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include <stdio.h>
 #include "simgrid/sg_config.h"
 #include "surf/surf.h"
@@ -119,10 +115,6 @@ void test(char *platform)
   XBT_DEBUG("Simulation Terminated");
 }
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);       /* Initialize some common structures */
diff --git a/teshsuite/surf/surf_usage/surf_usage2.c b/teshsuite/surf/surf_usage/surf_usage2.c
index 8d3791e95c..c59240daf4 100644
--- a/teshsuite/surf/surf_usage/surf_usage2.c
+++ b/teshsuite/surf/surf_usage/surf_usage2.c
@@ -6,10 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include <stdio.h>
 #include "simgrid/sg_config.h"
 #include "surf/surf.h"
@@ -97,10 +93,6 @@ void test(char *platform)
 
 }
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);       /* Initialize some common structures */
diff --git a/teshsuite/surf/trace_usage/trace_usage.c b/teshsuite/surf/trace_usage/trace_usage.c
index d56c0d755d..32ab9e3b53 100644
--- a/teshsuite/surf/trace_usage/trace_usage.c
+++ b/teshsuite/surf/trace_usage/trace_usage.c
@@ -6,10 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include "surf/trace_mgr.h"
 #include "surf/surf.h"
 
@@ -52,11 +48,6 @@ void test(void)
   free(host_A);
 }
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
-
 int main(int argc, char **argv)
 {
   surf_init(&argc, argv);
diff --git a/teshsuite/xbt/graphxml_usage/graphxml_usage.c b/teshsuite/xbt/graphxml_usage/graphxml_usage.c
index 2a1f6f0d08..767dbeb1e2 100644
--- a/teshsuite/xbt/graphxml_usage/graphxml_usage.c
+++ b/teshsuite/xbt/graphxml_usage/graphxml_usage.c
@@ -6,10 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include <stdio.h>
 
 #ifdef _MSC_VER
@@ -158,10 +154,6 @@ void test(char *graph_file)
 
 }
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
 int main(int argc, char **argv)
 {
   xbt_init(&argc, argv);
diff --git a/teshsuite/xbt/heap_bench/heap_bench.c b/teshsuite/xbt/heap_bench/heap_bench.c
index a6d9157be3..823d6e1aba 100644
--- a/teshsuite/xbt/heap_bench/heap_bench.c
+++ b/teshsuite/xbt/heap_bench/heap_bench.c
@@ -6,10 +6,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <xbt/xbt_os_time.h>
@@ -19,11 +15,7 @@
 
 #define MAX_TEST 1000000
 
-#ifdef __BORLANDC__
-int _XBT_CALL compare_double(const void *a, const void *b);
-#else
 int compare_double(const void *a, const void *b);
-#endif
 
 void test_heap_validity(int size);
 void test_heap_mean_operation(int size);
@@ -114,10 +106,6 @@ void test_reset_heap(xbt_heap_t * heap, int size)
 
 }
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
 int main(int argc, char **argv)
 {
   int size;
diff --git a/teshsuite/xbt/log_usage/log_usage.c b/teshsuite/xbt/log_usage/log_usage.c
index e5b41e1ef1..c5f6f0a7b5 100644
--- a/teshsuite/xbt/log_usage/log_usage.c
+++ b/teshsuite/xbt/log_usage/log_usage.c
@@ -6,20 +6,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 #include "xbt.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(test, top,
                                 "Logging specific to this test");
 XBT_LOG_NEW_CATEGORY(top, "Useless test channel");
 
-#ifdef __BORLANDC__
-#pragma argsused
-#endif
-
 static void dolog(const char *settings)
 {
   XBT_INFO("Test with the settings '%s'", settings);