fixed macros: CLK_TCK, malloc_usable_size.

diff --git a/src/texsourc/Makefile.macosx.clang.static b/src/texsourc/Makefile.macosx.clang.static
index 4f098aa..c75a4e8 100644 (file)
--- a/src/texsourc/Makefile.macosx.clang.static
+++ b/src/texsourc/Makefile.macosx.clang.static
@@ -7,7 +7,7 @@
 #\r
 \r
 CC = clang\r
-CFLAGS = -g -c -O2 -Wno-unused-result -I/Users/maqiyuan/dev/extra/include\r
+CFLAGS = -g -c -O2 -Wno-unused-result -Wno-dangling-else -I/Users/maqiyuan/dev/extra/include\r
 LDFLAGS = /Users/maqiyuan/dev/extra/lib/libkpathsea.a libdpx.a libpng.a libpaper.a libz.a -lm\r
 \r
 objects = yandytex.o itex.o openinou.o subroute.o local.o \\r

diff --git a/src/texsourc/local.c b/src/texsourc/local.c
index 0e53b88..5e7d011 100644 (file)
--- a/src/texsourc/local.c
+++ b/src/texsourc/local.c
@@ -18,6 +18,13 @@
    02110-1301 USA.\r
 */\r
 \r
+#if   defined (__ANDROID__)\r
+  #define malloc_usable_size dlmalloc_usable_size\r
+#elif defined (__APPLE__)\r
+  #include <malloc/malloc.h>\r
+  #define malloc_usable_size malloc_size\r
+#endif\r
+\r
 #define EXTERN extern\r
 \r
 #include "yandytex.h"\r
@@ -31,12 +38,6 @@
   #define REALLOC realloc\r
 #endif\r
 \r
-#if   defined (__ANDROID__)\r
-  #define malloc_usable_size dlmalloc_usable_size\r
-#elif defined (__APPLE__)\r
-  #define malloc_usable_size malloc_size\r
-#endif\r
-\r
 #if   defined (__clang__)\r
 const char * compiler = "Clang/LLVM";\r
 #elif defined (__GNUC__) || defined(__GNUG__)\r
@@ -2891,8 +2892,12 @@ int main_init (int ac, char ** av)
   return 0;\r
 }\r
 \r
+#ifdef __APPLE__\r
+#undef CLK_TCK\r
+#endif\r
 #define CLK_TCK CLOCKS_PER_SEC\r
 \r
+\r
 void show_inter_val (clock_t inter_val)\r
 {\r
   int seconds, tenths, hundredth, thousands;\r

diff --git a/src/texsourc/openinou.c b/src/texsourc/openinou.c
index 17f1e9f..c9987b0 100644 (file)
--- a/src/texsourc/openinou.c
+++ b/src/texsourc/openinou.c
@@ -31,10 +31,6 @@
 \r
 extern int shorten_file_name;\r
 \r
-#ifdef FUNNY_CORE_DUMP\r
-  extern void funny_core_dump(void);\r
-#endif\r
-\r
 #ifdef BUILDNAMEDIRECT\r
 char * xconcat (char * buffer, char * s1, char * s2)\r
 {\r

diff --git a/src/texsourc/yandytex.c b/src/texsourc/yandytex.c
index 2076f35..2006236 100644 (file)
--- a/src/texsourc/yandytex.c
+++ b/src/texsourc/yandytex.c
@@ -738,36 +738,4 @@ int do_undump (char *p, int item_size, int nitems, FILE *in_file)
 #endif\r
 \r
   return 0;\r
-}\r
-\r
-#ifdef FUNNY_CORE_DUMP\r
-\r
-void funny_core_dump (void)\r
-{\r
-  int pid, w;\r
-  union wait status;\r
-\r
-  switch (pid = vfork ())\r
-  {\r
-    case -1:\r
-      perrormod ("vfork");\r
-      exit (-1);\r
-\r
-    case 0:\r
-       (void) signal (SIGQUIT, SIG_DFL);\r
-       (void) kill (getpid (), SIGQUIT);\r
-       (void) write (2, "how did we get here?\n", 21);\r
-       exit (1);\r
-\r
-    default:\r
-      while ((w = wait (&status)) != pid && w != -1)\r
-        ;\r
-\r
-      if (status.w_coredump)\r
-        exit (0);\r
-\r
-      (void) write (2, "attempt to dump core failed\n", 28);\r
-      exit (1);\r
-  }\r
-}\r
-#endif /* FUNNY_CORE_DUMP */
\ No newline at end of file
+}
\ No newline at end of file