Skip to content

Commit 9d666a6

Browse files
committed
Remove obstack
Convert from using obstack to use malloc and free
1 parent 3e96ab9 commit 9d666a6

11 files changed

Lines changed: 81 additions & 1017 deletions

File tree

configure.ac

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@ AC_ARG_ENABLE(
116116
[disable tokens (required by XML format)]),
117117
[], [enable_tokens="yes"])
118118

119-
AC_ARG_ENABLE(
120-
obstack,
121-
AS_HELP_STRING([--enable-obstack],
122-
[enable internal obstack (required on OS X)]),
123-
[enable_obstack="yes"], [])
124-
125119
AC_ARG_ENABLE(
126120
names,
127121
AS_HELP_STRING([--disable-names],
@@ -219,7 +213,6 @@ AM_CONDITIONAL([ENABLE_STRM], [test "$enable_streams" = "yes"])
219213
AM_CONDITIONAL([ENABLE_FMT], [test "$enable_formats" = "yes"])
220214
AM_CONDITIONAL([ENABLE_HIDRD_CONVERT], [test "$enable_hidrd_convert" = "yes"])
221215
AM_CONDITIONAL([ENABLE_TOKENS], [test "$enable_tokens" = "yes"])
222-
AM_CONDITIONAL([ENABLE_OBSTACK], [test "$enable_obstack" = "yes"])
223216
AM_CONDITIONAL([ENABLE_NAMES], [test "$enable_names" = "yes"])
224217
AM_CONDITIONAL([ENABLE_FMT_XML], [test "$enable_xml_format" = "yes"])
225218
AM_CONDITIONAL([ENABLE_FMT_SPEC], [test "$enable_spec_format" = "yes"])
@@ -283,7 +276,6 @@ AC_CONFIG_FILES([Makefile
283276
include/hidrd/fmt/spec/snk/Makefile
284277
include/hidrd/fmt/code/Makefile
285278
include/hidrd/usage/Makefile
286-
include/hidrd/obstack/Makefile
287279
288280
lib/Makefile
289281
lib/util/Makefile
@@ -304,7 +296,6 @@ AC_CONFIG_FILES([Makefile
304296
lib/fmt/spec/snk/Makefile
305297
lib/fmt/code/Makefile
306298
lib/usage/Makefile
307-
lib/obstack/Makefile
308299
309300
src/Makefile])
310301
AC_OUTPUT

include/hidrd/Makefile.am

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ else
3838
WITH_TOKENS_DIRECTIVE = undef
3939
endif
4040

41-
if ENABLE_OBSTACK
42-
WITH_OBSTACK_DIRECTIVE = define
43-
else
44-
WITH_OBSTACK_DIRECTIVE = undef
45-
endif
46-
4741
if ENABLE_NAMES
4842
WITH_NAMES_DIRECTIVE = define
4943
else
@@ -63,7 +57,6 @@ endif
6357
cfg.h: cfg.h.m4
6458
m4 -DWITH_OPT_DIRECTIVE=$(WITH_OPT_DIRECTIVE) \
6559
-DWITH_TOKENS_DIRECTIVE=$(WITH_TOKENS_DIRECTIVE) \
66-
-DWITH_OBSTACK_DIRECTIVE=$(WITH_OBSTACK_DIRECTIVE) \
6760
-DWITH_NAMES_DIRECTIVE=$(WITH_NAMES_DIRECTIVE) \
6861
$< > $@
6962

include/hidrd/cfg.h.m4

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ dnl
5959
/** Defined if tokens should be supported across all relevant libraries */
6060
#'WITH_TOKENS_DIRECTIVE()` HIDRD_WITH_TOKENS
6161

62-
/** Defined if to use included obstack rather than the system provided one, a workaround for OS X */
63-
#'WITH_OBSTACK_DIRECTIVE()` HIDRD_WITH_INTERNAL_OBSTACK
64-
6562
/** Defined if names should be supported across all relevant libraries */
6663
#'WITH_NAMES_DIRECTIVE()` HIDRD_WITH_NAMES
6764

include/hidrd/obstack/Makefile.am

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)