remove dead code since #42586 [NFC] (#44782)

JuliaLang · Mar 29, 2022 · c2cec7a · c2cec7a
1 parent ff0e25c
commit c2cec7a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 277 deletions.
diff --git a/src/flisp/flisp.c b/src/flisp/flisp.c
@@ -41,6 +41,7 @@
 #include <locale.h>
 #include <limits.h>
 #include <errno.h>
+#include <libgen.h> // defines dirname
 
 #include "platform.h"
 #include "libsupport.h"
@@ -51,13 +52,6 @@
 extern "C" {
 #endif
 
-#if defined(_OS_WINDOWS_) && !defined(_COMPILER_GCC_)
-#include <malloc.h>
-JL_DLLEXPORT char * dirname(char *);
-#else
-#include <libgen.h>
-#endif
-
 static const char *const builtin_names[] =
     { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
       NULL, NULL, NULL, NULL,

diff --git a/src/init.c b/src/init.c
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
-
 #include <errno.h>
+#include <libgen.h> // defines dirname
 
 #if !defined(_OS_WINDOWS_) || defined(_COMPILER_GCC_)
 #include <getopt.h>
@@ -34,8 +34,6 @@
 extern "C" {
 #endif
 
-#include <libgen.h>
-
 #ifdef _OS_WINDOWS_
 extern int needsSymRefreshModuleList;
 extern BOOL (WINAPI *hSymRefreshModuleList)(HANDLE);

diff --git a/src/jlapi.c b/src/jlapi.c
@@ -22,15 +22,6 @@ extern "C" {
 #include <fenv.h>
 #endif
 
-#if defined(_OS_WINDOWS_) && !defined(_COMPILER_GCC_)
-JL_DLLEXPORT char * __cdecl dirname(char *);
-#else
-#include <libgen.h>
-#endif
-#ifndef _OS_WINDOWS_
-#include <dlfcn.h>
-#endif
-
 JL_DLLEXPORT int jl_is_initialized(void)
 {
     return jl_main_module != NULL;

diff --git a/src/julia.h b/src/julia.h
@@ -56,13 +56,10 @@
 #  define JL_NORETURN __attribute__ ((noreturn))
 #  define JL_CONST_FUNC __attribute__((const))
 #  define JL_USED_FUNC __attribute__((used))
-#  define JL_SECTION(name) __attribute__((section(name)))
-#  define JL_THREAD_LOCAL __thread
 #else
 #  define JL_NORETURN
 #  define JL_CONST_FUNC
 #  define JL_USED_FUNC
-#  define JL_THREAD_LOCAL
 #endif
 
 #define container_of(ptr, type, member) \

diff --git a/src/support/dirname.c b/src/support/dirname.c
diff --git a/src/sys.c b/src/sys.c
@@ -58,12 +58,6 @@
 extern "C" {
 #endif
 
-#if defined(_OS_WINDOWS_) && !defined(_COMPILER_GCC_)
-JL_DLLEXPORT char *dirname(char *);
-#else
-#include <libgen.h>
-#endif
-
 JL_DLLEXPORT int jl_sizeof_off_t(void) { return sizeof(off_t); }
 #ifndef _OS_WINDOWS_
 JL_DLLEXPORT int jl_sizeof_mode_t(void) { return sizeof(mode_t); }