Skip to content

Commit

Permalink
Remove obstack
Browse files Browse the repository at this point in the history
Convert from using obstack to use malloc and free
  • Loading branch information
ShaharHD committed May 9, 2020
1 parent 3e96ab9 commit 9d666a6
Show file tree
Hide file tree
Showing 11 changed files with 81 additions and 1,017 deletions.
9 changes: 0 additions & 9 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,6 @@ AC_ARG_ENABLE(
[disable tokens (required by XML format)]),
[], [enable_tokens="yes"])

AC_ARG_ENABLE(
obstack,
AS_HELP_STRING([--enable-obstack],
[enable internal obstack (required on OS X)]),
[enable_obstack="yes"], [])

AC_ARG_ENABLE(
names,
AS_HELP_STRING([--disable-names],
Expand Down Expand Up @@ -219,7 +213,6 @@ AM_CONDITIONAL([ENABLE_STRM], [test "$enable_streams" = "yes"])
AM_CONDITIONAL([ENABLE_FMT], [test "$enable_formats" = "yes"])
AM_CONDITIONAL([ENABLE_HIDRD_CONVERT], [test "$enable_hidrd_convert" = "yes"])
AM_CONDITIONAL([ENABLE_TOKENS], [test "$enable_tokens" = "yes"])
AM_CONDITIONAL([ENABLE_OBSTACK], [test "$enable_obstack" = "yes"])
AM_CONDITIONAL([ENABLE_NAMES], [test "$enable_names" = "yes"])
AM_CONDITIONAL([ENABLE_FMT_XML], [test "$enable_xml_format" = "yes"])
AM_CONDITIONAL([ENABLE_FMT_SPEC], [test "$enable_spec_format" = "yes"])
Expand Down Expand Up @@ -283,7 +276,6 @@ AC_CONFIG_FILES([Makefile
include/hidrd/fmt/spec/snk/Makefile
include/hidrd/fmt/code/Makefile
include/hidrd/usage/Makefile
include/hidrd/obstack/Makefile
lib/Makefile
lib/util/Makefile
Expand All @@ -304,7 +296,6 @@ AC_CONFIG_FILES([Makefile
lib/fmt/spec/snk/Makefile
lib/fmt/code/Makefile
lib/usage/Makefile
lib/obstack/Makefile
src/Makefile])
AC_OUTPUT
7 changes: 0 additions & 7 deletions include/hidrd/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ else
WITH_TOKENS_DIRECTIVE = undef
endif

if ENABLE_OBSTACK
WITH_OBSTACK_DIRECTIVE = define
else
WITH_OBSTACK_DIRECTIVE = undef
endif

if ENABLE_NAMES
WITH_NAMES_DIRECTIVE = define
else
Expand All @@ -63,7 +57,6 @@ endif
cfg.h: cfg.h.m4
m4 -DWITH_OPT_DIRECTIVE=$(WITH_OPT_DIRECTIVE) \
-DWITH_TOKENS_DIRECTIVE=$(WITH_TOKENS_DIRECTIVE) \
-DWITH_OBSTACK_DIRECTIVE=$(WITH_OBSTACK_DIRECTIVE) \
-DWITH_NAMES_DIRECTIVE=$(WITH_NAMES_DIRECTIVE) \
$< > $@

Expand Down
3 changes: 0 additions & 3 deletions include/hidrd/cfg.h.m4
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ dnl
/** Defined if tokens should be supported across all relevant libraries */
#'WITH_TOKENS_DIRECTIVE()` HIDRD_WITH_TOKENS

/** Defined if to use included obstack rather than the system provided one, a workaround for OS X */
#'WITH_OBSTACK_DIRECTIVE()` HIDRD_WITH_INTERNAL_OBSTACK

/** Defined if names should be supported across all relevant libraries */
#'WITH_NAMES_DIRECTIVE()` HIDRD_WITH_NAMES

Expand Down
24 changes: 0 additions & 24 deletions include/hidrd/obstack/Makefile.am

This file was deleted.

Loading

0 comments on commit 9d666a6

Please sign in to comment.