From e62b9240327b8585d8c9d42aec0862e025736c3e Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 11 Jun 2022 01:26:08 +0000 Subject: [PATCH] removed std-prv.h --- hawk/lib/Makefile.am | 1 - hawk/lib/Makefile.in | 12 +++++------ hawk/lib/std-prv.h | 51 -------------------------------------------- hawk/lib/std.c | 3 +-- 4 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 hawk/lib/std-prv.h diff --git a/hawk/lib/Makefile.am b/hawk/lib/Makefile.am index 335907ef..4f947d0c 100644 --- a/hawk/lib/Makefile.am +++ b/hawk/lib/Makefile.am @@ -148,7 +148,6 @@ libhawk_la_SOURCES += \ sio.c \ syscall.h \ tio.c \ - std-prv.h \ std.c \ std-sed.c diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in index 10d2aa09..7786cb5f 100644 --- a/hawk/lib/Makefile.in +++ b/hawk/lib/Makefile.in @@ -244,10 +244,10 @@ am__libhawk_la_SOURCES_DIST = hawk.h hawk-arr.h hawk-chr.h hawk-cmn.h \ uch-case.h utf16.c utf8.c utl-ass.c utl-rnd.c utl-sort.c \ utl-str.c utl-sys.c utl.c val-prv.h val.c xma.c hawk-cli.h \ hawk-fio.h hawk-mtx.h hawk-pio.h hawk-sio.h hawk-tio.h \ - cli-imp.h cli.c fio.c mtx.c pio.c sio.c syscall.h tio.c \ - std-prv.h std.c std-sed.c Hawk.cpp Std.cpp Sed.cpp Std-Sed.cpp \ - mod-hawk.c mod-hawk.h mod-math.c mod-math.h mod-str.c \ - mod-str.h mod-sys.c mod-sys.h + cli-imp.h cli.c fio.c mtx.c pio.c sio.c syscall.h tio.c std.c \ + std-sed.c Hawk.cpp Std.cpp Sed.cpp Std-Sed.cpp mod-hawk.c \ + mod-hawk.h mod-math.c mod-math.h mod-str.c mod-str.h mod-sys.c \ + mod-sys.h am__objects_1 = am__objects_2 = $(am__objects_1) @ENABLE_CXX_TRUE@am__objects_3 = libhawk_la-Hawk.lo libhawk_la-Std.lo \ @@ -617,8 +617,8 @@ libhawk_la_SOURCES = $(pkginclude_HEADERS) arr.c chr.c dir.c ecs-imp.h \ uch-case.h utf16.c utf8.c utl-ass.c utl-rnd.c utl-sort.c \ utl-str.c utl-sys.c utl.c val-prv.h val.c xma.c hawk-cli.h \ hawk-fio.h hawk-mtx.h hawk-pio.h hawk-sio.h hawk-tio.h \ - cli-imp.h cli.c fio.c mtx.c pio.c sio.c syscall.h tio.c \ - std-prv.h std.c std-sed.c $(am__append_8) $(am__append_9) + cli-imp.h cli.c fio.c mtx.c pio.c sio.c syscall.h tio.c std.c \ + std-sed.c $(am__append_8) $(am__append_9) libhawk_la_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) $(CPPFLAGS_PFMOD) \ $(am__append_3) libhawk_la_CFLAGS = $(CFLAGS_ALL_COMMON) diff --git a/hawk/lib/std-prv.h b/hawk/lib/std-prv.h deleted file mode 100644 index 373814ad..00000000 --- a/hawk/lib/std-prv.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * $Id$ - * - Copyright (c) 2006-2020 Chung, Hyung-Hwan. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _HAWK_STD_PRV_H_ -#define _HAWK_STD_PRV_H_ - -#include - -#if defined(__cplusplus) -extern "C" { -#endif - -HAWK_EXPORT hawk_flt_t hawk_stdmathpow (hawk_t* hawk, hawk_flt_t x, hawk_flt_t y); -HAWK_EXPORT hawk_flt_t hawk_stdmathmod (hawk_t* hawk, hawk_flt_t x, hawk_flt_t y); - -HAWK_EXPORT int hawk_stdmodstartup (hawk_t* hawk); -HAWK_EXPORT void hawk_stdmodshutdown (hawk_t* hawk); - -HAWK_EXPORT void* hawk_stdmodopen (hawk_t* hawk, const hawk_mod_spec_t* spec); -HAWK_EXPORT void hawk_stdmodclose (hawk_t* hawk, void* handle); -HAWK_EXPORT void* hawk_stdmodgetsym (hawk_t* hawk, void* handle, const hawk_ooch_t* name); - -#if defined(__cplusplus) -} -#endif - - -#endif diff --git a/hawk/lib/std.c b/hawk/lib/std.c index 4e119459..4972874e 100644 --- a/hawk/lib/std.c +++ b/hawk/lib/std.c @@ -25,8 +25,7 @@ */ #include "hawk-prv.h" -#include "std-prv.h" - +#include #include #include