mirror of
https://github.com/lcn2/calc.git
synced 2025-08-19 01:13:27 +03:00
Compare commits
11 Commits
v2.14.1.1
...
prod-2.14.
Author | SHA1 | Date | |
---|---|---|---|
|
d91ace6091 | ||
|
49c6a8218c | ||
|
def203f273 | ||
|
5b2983f421 | ||
|
e6fc1a92a9 | ||
|
3e084d9fb9 | ||
|
340c1990ce | ||
|
5acd67c704 | ||
|
083011c9e3 | ||
|
dce2c6f0ee | ||
|
827988c553 |
16
.github/ISSUE_TEMPLATE/calc-bug-report.md
vendored
16
.github/ISSUE_TEMPLATE/calc-bug-report.md
vendored
@@ -7,7 +7,7 @@ assignees: ''
|
||||
|
||||
---
|
||||
|
||||
Calc bug report template version: 1.2 2022-02-24
|
||||
Calc bug report template version: 1.3 2022-11-27
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
@@ -19,7 +19,7 @@ Steps to reproduce the behavior:
|
||||
I.e., provide the command line you used to launch calc
|
||||
|
||||
1. Calc commands and their output
|
||||
Please provide any calc commands you entered on the the terminal.
|
||||
Please provide any calc commands you entered on the terminal.
|
||||
Please provide the calc command line output inline as well.
|
||||
If the above is long, please attach a file.
|
||||
|
||||
@@ -33,11 +33,11 @@ Steps to reproduce the behavior:
|
||||
**Expected behavior**
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
**Attach make debug output**
|
||||
IMPORTANT: Please attach the output from `make debug`.
|
||||
**Attach debug.out**
|
||||
IMPORTANT: Please run `make debug` and then attach the `debug.out` file.
|
||||
|
||||
**Screenshots**
|
||||
If applicable, attach screenshots to help explain your problem.
|
||||
**Screen shots**
|
||||
If applicable, attach screen shots to help explain your problem.
|
||||
|
||||
**Execution environment (please complete the following information):**
|
||||
- OS:
|
||||
@@ -48,14 +48,14 @@ If applicable, attach screenshots to help explain your problem.
|
||||
or if no uname command, a description of the OS version/release you are using
|
||||
|
||||
- OS distribution:
|
||||
E.g., macOS Monterey, contents of /etc/redhat-releaseor /etc/os-release, etc.
|
||||
E.g., macOS 13.0.1, contents of /etc/redhat-release, or /etc/os-release, etc.
|
||||
|
||||
- Calc Version
|
||||
E.g., output of calc -v
|
||||
or if you cannot compile calc, the version you downloaded and from where it came from
|
||||
|
||||
- Shell and shell version
|
||||
E.g.., bash, zsh, power shell, etc.
|
||||
E.g., bash, zsh, power shell, etc.
|
||||
and the version of the shell you are using, if known
|
||||
|
||||
**Calc mods**
|
||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@@ -29,6 +29,7 @@ cscript/simple
|
||||
cscript/square
|
||||
custom/.all
|
||||
custom/libcustcalc*
|
||||
debug.out
|
||||
endian
|
||||
endian_calc.h
|
||||
fposval.h
|
||||
@@ -36,7 +37,7 @@ have_arc4random.h
|
||||
have_ban_pragma.h
|
||||
have_const.h
|
||||
have_environ.h
|
||||
have_fpos.h
|
||||
have_fgetsetpos.h
|
||||
have_fpos_pos.h
|
||||
have_getpgid.h
|
||||
have_getprid.h
|
||||
|
132
CHANGES
132
CHANGES
@@ -1,4 +1,96 @@
|
||||
The following are the changes from calc version 2.14.1.0 to date:
|
||||
The following are the changes from calc version 2.14.1.2 to date:
|
||||
|
||||
Restored use of the #define FPOS_POS_LEN symbol. This refers to
|
||||
the length of the __pos element (if the __pos element exists),
|
||||
the fpos_t type (if that type exists).
|
||||
|
||||
Changed SWAP_HALF_IN_FILEPOS(dest, src) mato to use FILEPOS_LEN Little
|
||||
Endian when FILEPOS is a simple scalar type (i.e., HAVE_FILEPOS_SCALAR
|
||||
is defined).
|
||||
|
||||
Changed #define HAVE_FPOS to HAVE_FGETSETPOS.
|
||||
|
||||
Corrected comment in have_fpos_pos.h. The HAVE_FPOS_POS symbol was
|
||||
NOT related to fgetpos & fsetpos but rather if we we have an __pos
|
||||
element in FILEPOS.
|
||||
|
||||
Changed #define HAVE_NO_FPOS to HAVE_NO_FGETSETPOS.
|
||||
|
||||
Improved comments in have_fpos_pos.h to show why and how
|
||||
HAVE_FPOS_POS, FPOS_POS_BITS, and FPOS_POS_LEN were defined or undefed.
|
||||
|
||||
Changed showfiles builtin to print sizes cast to (long int) with
|
||||
the "%ld" printf format to avoid implementations that do not support
|
||||
the "%lld" printf format specifier.
|
||||
|
||||
Renamed have_fpos.h to have_fgetsetpos.h. Renamed CALC_HAVE_FPOS_H
|
||||
to CALC_HAVE_FGETSETPOS_H. The make install and the olduninstall
|
||||
rules remove the any old have_fpos.h that was previously installed.
|
||||
|
||||
Added swap_HALFs(dest, src, len) function to byteswap.c.
|
||||
|
||||
Calc can now handle Big Engian file position sizes that are a
|
||||
multiple of BASEB bits in length. Before handle Big Engian file
|
||||
positions could only be 32 and 64 bits in length. This will allow,
|
||||
for example, a Big Engian file position size of 128 (assuming that
|
||||
128/BASEB is is an integer).
|
||||
|
||||
Temporary workaround for musl libc systems such as gentoo Linux that
|
||||
allows them to compile calc and successfully run the regression test.
|
||||
|
||||
|
||||
The following are the changes from calc version 2.14.1.1 to 2.14.1.1:
|
||||
|
||||
Added a few remarks on calc version numbers to version.c.
|
||||
|
||||
Fixed how fposval.h is built. On a number of systems, the fposval.c
|
||||
file failed to compile incorrectly. This caused problems for systems in
|
||||
which fposval.h.def was not correct.
|
||||
|
||||
Fixed how have_memmv.h is built. On a number of systems, the have_memmv.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_memmv.h file for such systems.
|
||||
|
||||
Fixed how align32.h is built. On a number of systems, the align32.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
align32.h file for such systems.
|
||||
|
||||
Fixed how have_newstr.h is built. On a number of systems, the have_newstr.c
|
||||
failed to compile incorrectly, producing a potentially incorrect
|
||||
have_newstr.h file for such systems.
|
||||
|
||||
Fixed how have_strdup.h is built. On a number of systems, the have_strdup.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_strdup.h file for such systems.
|
||||
|
||||
Fixed how have_strlcat.h is built. On a number of systems, the have_strlcat.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_strlcat.h file for such systems.
|
||||
|
||||
Fixed how have_strlcpy.h is built. On a number of systems, the have_strlcpy.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_strlcpy.h file for such systems.
|
||||
|
||||
Fixed how have_uid_t.h is built. On a number of systems, the have_uid_t.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_uid_t.h file for such systems.
|
||||
|
||||
Fixed how have_uid_t.h is built. On a number of systems, the have_uid_t.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_uid_t.h file for such systems.
|
||||
|
||||
Added full_debug rule to Makefile. This does the work of the
|
||||
old debug rule in a more verbose mode by using Q= H=@ S= E= V=@.
|
||||
|
||||
The debug rule in the Makefile now pre-removes debug.out and then
|
||||
runs make full_debug sending stdout and stderr to debug.out. It then
|
||||
prints a few instructions about filing a GitHub issue bug report.
|
||||
|
||||
The full_debug rule will no longer stop when one of the sub-tasks
|
||||
failed (exit non-zero).
|
||||
|
||||
|
||||
The following are the changes from calc version 2.14.1.0 to 2.14.1.0:
|
||||
|
||||
Fixed alignment of show item section of help command.
|
||||
|
||||
@@ -65,44 +157,6 @@ The following are the changes from calc version 2.14.1.0 to date:
|
||||
|
||||
The value produced by str_comma() is returned.
|
||||
|
||||
Added a few remarks on calc version numbers to version.c.
|
||||
|
||||
Fixed how fposval.h is built. On a number of systems, the fposval.c
|
||||
file failed to compile incorrectly. This caused problems for systems in
|
||||
which fposval.h.def was not correct.
|
||||
|
||||
Fixed how have_memmv.h is built. On a number of systems, the have_memmv.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_memmv.h file for such systems.
|
||||
|
||||
Fixed how align32.h is built. On a number of systems, the align32.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
align32.h file for such systems.
|
||||
|
||||
Fixed how have_newstr.h is built. On a number of systems, the have_newstr.c
|
||||
failed to compile incorrectly, producing a potentially incorrect
|
||||
have_newstr.h file for such systems.
|
||||
|
||||
Fixed how have_strdup.h is built. On a number of systems, the have_strdup.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_strdup.h file for such systems.
|
||||
|
||||
Fixed how have_strlcat.h is built. On a number of systems, the have_strlcat.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_strlcat.h file for such systems.
|
||||
|
||||
Fixed how have_strlcpy.h is built. On a number of systems, the have_strlcpy.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_strlcpy.h file for such systems.
|
||||
|
||||
Fixed how have_uid_t.h is built. On a number of systems, the have_uid_t.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_uid_t.h file for such systems.
|
||||
|
||||
Fixed how have_uid_t.h is built. On a number of systems, the have_uid_t.c
|
||||
file failed to compile incorrectly, producing a potentially incorrect
|
||||
have_uid_t.h file for such systems.
|
||||
|
||||
|
||||
The following are the changes from calc version 2.14.0.15 to 2.14.0.15:
|
||||
|
||||
|
118
Makefile
118
Makefile
@@ -280,14 +280,14 @@ LONG_BITS=
|
||||
# Determine if we have the ANSI C fgetpos and fsetpos alternate interface
|
||||
# to the ftell() and fseek() (with whence set to SEEK_SET) functions.
|
||||
#
|
||||
# If HAVE_FPOS is empty, this Makefile will run the have_fpos program
|
||||
# to determine if there is are fgetpos and fsetpos functions. If HAVE_FPOS
|
||||
# is set to -DHAVE_NO_FPOS, then calc will use ftell() and fseek().
|
||||
# If HAVE_FGETSETPOS is empty, this Makefile will run the have_fpos program
|
||||
# to determine if there is are fgetpos and fsetpos functions. If HAVE_FGETSETPOS
|
||||
# is set to -DHAVE_NO_FGETSETPOS, then calc will use ftell() and fseek().
|
||||
#
|
||||
# If in doubt, leave HAVE_FPOS empty and this Makefile will figure it out.
|
||||
# If in doubt, leave HAVE_FGETSETPOS empty and this Makefile will figure it out.
|
||||
#
|
||||
HAVE_FPOS=
|
||||
#HAVE_FPOS= -DHAVE_NO_FPOS
|
||||
HAVE_FGETSETPOS=
|
||||
#HAVE_FGETSETPOS= -DHAVE_NO_FGETSETPOS
|
||||
|
||||
# Determine if we have an __pos element of a file position (fpos_t) structure.
|
||||
#
|
||||
@@ -1309,7 +1309,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.14.1.1
|
||||
VERSION= 2.14.1.2
|
||||
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
@@ -1993,7 +1993,7 @@ ifndef EXCLUDE_FROM_CUSTOM_MAKEFILE
|
||||
# Q= echo internal Makefile actions (debug / verbose mode)
|
||||
#
|
||||
# H=@: do not report hsrc file formation progress
|
||||
# H=@ do echo hsrc file formation progress
|
||||
# H=@ echo hsrc file formation progress
|
||||
#
|
||||
# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation
|
||||
# S= full ${CC} output during hsrc file formation
|
||||
@@ -2002,7 +2002,7 @@ ifndef EXCLUDE_FROM_CUSTOM_MAKEFILE
|
||||
# E= full command stderr during hsrc file formation
|
||||
#
|
||||
# V=@: do not echo debug statements (quiet mode)
|
||||
# V=@ do echo debug statements (debug / verbose mode)
|
||||
# V=@ echo debug statements (debug / verbose mode)
|
||||
#
|
||||
#Q=
|
||||
Q=@
|
||||
@@ -2069,7 +2069,7 @@ LIB_H_SRC= alloc.h banned.h blkcpy.h block.h byteswap.h calc.h cmath.h \
|
||||
# we build these .h files during the make
|
||||
#
|
||||
BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
|
||||
fposval.h have_ban_pragma.h have_const.h have_fpos.h \
|
||||
fposval.h have_ban_pragma.h have_const.h have_fgetsetpos.h \
|
||||
have_fpos_pos.h have_getpgid.h have_getprid.h have_getsid.h \
|
||||
have_gettime.h have_memmv.h have_newstr.h have_offscl.h \
|
||||
have_posscl.h have_rusage.h have_stdlib.h have_strdup.h \
|
||||
@@ -2087,7 +2087,7 @@ BUILD_C_SRC= calcerr.c
|
||||
# There MUST be a .c for every .o in UTIL_OBJS.
|
||||
#
|
||||
UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
|
||||
have_const.c have_stdvs.c have_varvs.c fposval.c have_fpos.c \
|
||||
have_const.c have_stdvs.c have_varvs.c fposval.c have_fgetsetpos.c \
|
||||
have_fpos_pos.c have_offscl.c have_posscl.c have_memmv.c \
|
||||
have_ustat.c have_getsid.c have_getpgid.c have_environ.c \
|
||||
have_gettime.c have_getprid.c have_rusage.c have_strdup.c \
|
||||
@@ -2105,7 +2105,7 @@ UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \
|
||||
# There MUST be a .o for every .c in UTIL_C_SRC.
|
||||
#
|
||||
UTIL_OBJS= endian.o longbits.o have_newstr.o have_uid_t.o \
|
||||
have_const.o fposval.o have_fpos.o have_fpos_pos.o \
|
||||
have_const.o fposval.o have_fgetsetpos.o have_fpos_pos.o \
|
||||
try_strarg.o have_stdvs.o have_varvs.o have_posscl.o have_memmv.o \
|
||||
have_ustat.o have_getsid.o have_getpgid.o have_environ.o \
|
||||
have_gettime.o have_getprid.o ver_calc.o have_rusage.o have_strdup.o \
|
||||
@@ -3176,7 +3176,7 @@ terminal.h: ${MAKE_FILE} ${LOC_MKF}
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
have_fgetsetpos.h: have_fgetsetpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} ${RM} -f fpos_tmp $@
|
||||
${H} echo 'forming $@'
|
||||
${Q} echo '/*' > $@
|
||||
@@ -3184,29 +3184,29 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} echo ' */' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '#if !defined(CALC_HAVE_FPOS_H)' >> $@
|
||||
${Q} echo '#define CALC_HAVE_FPOS_H' >> $@
|
||||
${Q} echo '#if !defined(CALC_HAVE_FGETSETPOS_H)' >> $@
|
||||
${Q} echo '#define CALC_HAVE_FGETSETPOS_H' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '/* do we have fgetpos & fsetpos functions? */' >> $@
|
||||
${Q} ${RM} -f have_fpos.o have_fpos${EXT}
|
||||
-${Q} ${LCC} ${HAVE_FPOS} ${ICFLAGS} have_fpos.c -c ${S} \
|
||||
${Q} ${RM} -f have_fgetsetpos.o have_fpos${EXT}
|
||||
-${Q} ${LCC} ${HAVE_FGETSETPOS} ${ICFLAGS} have_fgetsetpos.c -c ${S} \
|
||||
|| ${TRUE}
|
||||
-${Q} ${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos${EXT} ${S} \
|
||||
-${Q} ${LCC} ${ILDFLAGS} have_fgetsetpos.o -o have_fpos${EXT} ${S} \
|
||||
|| ${TRUE}
|
||||
-${Q} ./have_fpos${EXT} > fpos_tmp ${E} \
|
||||
|| ${TRUE}
|
||||
-${Q} if [ -s fpos_tmp ]; then \
|
||||
${CAT} fpos_tmp >> $@; \
|
||||
else \
|
||||
echo '#undef HAVE_FPOS /* no */' >> $@; \
|
||||
echo '#undef HAVE_FGETSETPOS /* no */' >> $@; \
|
||||
echo '' >> $@; \
|
||||
echo 'typedef long FILEPOS;' >> $@; \
|
||||
fi
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '#endif /* !CALC_HAVE_FPOS_H */' >> $@
|
||||
${Q} ${RM} -f have_fpos${EXT} have_fpos.o fpos_tmp
|
||||
${Q} echo '#endif /* !CALC_HAVE_FGETSETPOS_H */' >> $@
|
||||
${Q} ${RM} -f have_fpos${EXT} have_fgetsetpos.o fpos_tmp
|
||||
${H} echo '$@ formed'
|
||||
-@if [ -z "${Q}" ]; then \
|
||||
echo ''; \
|
||||
@@ -3218,7 +3218,7 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
|
||||
have_fpos_pos.h: have_fpos_pos.c have_fgetsetpos.h have_posscl.h \
|
||||
banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} ${RM} -f fpos_tmp $@
|
||||
${H} echo 'forming $@'
|
||||
@@ -3231,9 +3231,9 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
|
||||
${Q} echo '#define CALC_HAVE_FPOS_POS_H' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '/* do we have fgetpos & fsetpos functions? */' >> $@
|
||||
${Q} echo '/* do we have an __pos element in FILEPOS? */' >> $@
|
||||
${Q} ${RM} -f have_fpos_pos.o have_fpos_pos${EXT}
|
||||
-${Q} ${LCC} ${HAVE_FPOS} ${HAVE_FPOS_POS} ${ICFLAGS} \
|
||||
-${Q} ${LCC} ${HAVE_FGETSETPOS} ${HAVE_FPOS_POS} ${ICFLAGS} \
|
||||
have_fpos_pos.c -c ${S} \
|
||||
|| ${TRUE}
|
||||
-${Q} ${LCC} ${ILDFLAGS} have_fpos_pos.o -o have_fpos_pos${EXT} ${S} \
|
||||
@@ -3262,7 +3262,7 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
|
||||
fposval.h: fposval.c have_fgetsetpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
|
||||
endian_calc.h banned.h have_ban_pragma.h fposval.h.def alloc.h \
|
||||
have_newstr.h have_memmv.h have_string.h have_const.h have_string.h \
|
||||
have_unused.h ${MAKE_FILE} ${LOC_MKF}
|
||||
@@ -3390,7 +3390,7 @@ have_offscl.h: have_offscl.c have_unistd.h \
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
have_posscl.h: have_posscl.c have_fpos.h have_unistd.h \
|
||||
have_posscl.h: have_posscl.c have_fgetsetpos.h have_unistd.h \
|
||||
banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} ${RM} -f have_posscl have_posscl.o posscl_tmp $@
|
||||
${H} echo 'forming $@'
|
||||
@@ -4701,11 +4701,14 @@ chk: ./cal/regress.cal
|
||||
# * print major Makefile variables
|
||||
# * build anything not yet built
|
||||
#
|
||||
# make debug:
|
||||
# make full_debug:
|
||||
# * remove everything that was previously built
|
||||
# * print major Makefile variables
|
||||
# * make everything
|
||||
# * run the regression tests
|
||||
#
|
||||
# make debug:
|
||||
# * run 'make full_debug' and write stdout and stderr to debug.out
|
||||
###
|
||||
|
||||
calcinfo:
|
||||
@@ -4822,7 +4825,7 @@ env:
|
||||
@echo 'HAVE_ARC4RANDOM=${HAVE_ARC4RANDOM}'; echo ''
|
||||
@echo 'HAVE_CONST=${HAVE_CONST}'; echo ''
|
||||
@echo 'HAVE_ENVIRON=${HAVE_ENVIRON}'; echo ''
|
||||
@echo 'HAVE_FPOS=${HAVE_FPOS}'; echo ''
|
||||
@echo 'HAVE_FGETSETPOS=${HAVE_FGETSETPOS}'; echo ''
|
||||
@echo 'HAVE_FPOS_POS=${HAVE_FPOS_POS}'; echo ''
|
||||
@echo 'HAVE_GETPGID=${HAVE_GETPGID}'; echo ''
|
||||
@echo 'HAVE_GETPRID=${HAVE_GETPRID}'; echo ''
|
||||
@@ -4938,45 +4941,58 @@ env:
|
||||
mkdebug: env version.c
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
@echo '=-=-=-= Contents of ${LOC_MKF} follows =-=-=-='
|
||||
@${CAT} ${LOC_MKF}
|
||||
-@${CAT} ${LOC_MKF}
|
||||
@echo '=-=-=-= End of contents of ${LOC_MKF} =-=-=-='
|
||||
@echo '=-=-=-= Determining the source version =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
|
||||
-@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
|
||||
-@./ver_calc${EXT}
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ all
|
||||
@${MAKE} -f Makefile Q= H=@ S= E= V=@ all
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Determining the binary version =-=-=-='
|
||||
-@./calc${EXT} -e -q -v
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
debug: calcinfo env
|
||||
full_debug: calcinfo env
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
@echo '=-=-=-= Contents of ${LOC_MKF} follows =-=-=-='
|
||||
@${CAT} ${LOC_MKF}
|
||||
-@${CAT} ${LOC_MKF}
|
||||
@echo '=-=-=-= End of contents of ${LOC_MKF} =-=-=-='
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ clobber
|
||||
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ clobber
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-='
|
||||
@echo '=-=-= this may take a bit of time =-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ all
|
||||
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ all
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Determining the source version =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
|
||||
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ ver_calc${EXT}
|
||||
-@./ver_calc${EXT}
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@${ECHON} '=-=-=-= Print #defile values if custom functions '
|
||||
-@${ECHON} '=-=-=-= Print #defile values if custom functions '
|
||||
@echo 'are allowed =-=-=-='
|
||||
-@${CALC_ENV} ./calc${EXT} -e -q -C 'print custom("sysinfo", 2);'
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ check =-=-=-='
|
||||
@echo '=-=-= this may take a while =-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ check
|
||||
-@${MAKE} -f Makefile Q= V=@ check
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
debug:
|
||||
-${RM} -f debug.out
|
||||
-${MAKE} -f Makefile full_debug 2>&1 | ${TEE} debug.out
|
||||
@echo
|
||||
@echo 'To file a bug report / open a GitHub Issue, visit:'
|
||||
@echo
|
||||
@echo ' https://github.com/lcn2/calc/issues'
|
||||
@echo
|
||||
@echo 'Click the ((New issue)) button to file a bug report.'
|
||||
@echo
|
||||
@echo 'Please attch the debug.out file to the bug report.'
|
||||
@echo
|
||||
|
||||
###
|
||||
#
|
||||
# testing rules
|
||||
@@ -5127,6 +5143,7 @@ olduninstall:
|
||||
-${RMDIR} /usr/local/bin/cscript
|
||||
${RM} -f inst_files
|
||||
${RM} -f ${CALC_INCDIR}/calcerr.c
|
||||
${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
|
||||
|
||||
tags: ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} ${MAKE_FILE}
|
||||
-${CTAGS} ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} 2>&1 | \
|
||||
@@ -5513,6 +5530,9 @@ endif
|
||||
fi
|
||||
${V} # NOTE: misc install cleanup
|
||||
${Q} ${RM} -f tmp
|
||||
${V} # NOTE: have_fgetsetpos.h has been renamed to have_fgetsetpos.h so we
|
||||
${V} # remove the old have_fgetsetpos.h include file.
|
||||
${Q} ${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
|
||||
${V} # NOTE: remove the calcerr.c that was installed by mistake
|
||||
${V} # under ${INC_DIR} in calc v2.12.9.1
|
||||
${Q} ${RM} -f ${T}${CALC_INCDIR}/calcerr.c
|
||||
@@ -5849,7 +5869,7 @@ blkcpy.o: file.h
|
||||
blkcpy.o: hash.h
|
||||
blkcpy.o: have_ban_pragma.h
|
||||
blkcpy.o: have_const.h
|
||||
blkcpy.o: have_fpos.h
|
||||
blkcpy.o: have_fgetsetpos.h
|
||||
blkcpy.o: have_memmv.h
|
||||
blkcpy.o: have_newstr.h
|
||||
blkcpy.o: have_stdlib.h
|
||||
@@ -6137,7 +6157,7 @@ file.o: fposval.h
|
||||
file.o: hash.h
|
||||
file.o: have_ban_pragma.h
|
||||
file.o: have_const.h
|
||||
file.o: have_fpos.h
|
||||
file.o: have_fgetsetpos.h
|
||||
file.o: have_fpos_pos.h
|
||||
file.o: have_memmv.h
|
||||
file.o: have_newstr.h
|
||||
@@ -6161,7 +6181,7 @@ fposval.o: endian_calc.h
|
||||
fposval.o: fposval.c
|
||||
fposval.o: have_ban_pragma.h
|
||||
fposval.o: have_const.h
|
||||
fposval.o: have_fpos.h
|
||||
fposval.o: have_fgetsetpos.h
|
||||
fposval.o: have_fpos_pos.h
|
||||
fposval.o: have_memmv.h
|
||||
fposval.o: have_newstr.h
|
||||
@@ -6187,7 +6207,7 @@ func.o: func.h
|
||||
func.o: hash.h
|
||||
func.o: have_ban_pragma.h
|
||||
func.o: have_const.h
|
||||
func.o: have_fpos.h
|
||||
func.o: have_fgetsetpos.h
|
||||
func.o: have_memmv.h
|
||||
func.o: have_newstr.h
|
||||
func.o: have_rusage.h
|
||||
@@ -6255,12 +6275,12 @@ have_const.o: have_const.c
|
||||
have_environ.o: banned.h
|
||||
have_environ.o: have_ban_pragma.h
|
||||
have_environ.o: have_environ.c
|
||||
have_fpos.o: banned.h
|
||||
have_fpos.o: have_ban_pragma.h
|
||||
have_fpos.o: have_fpos.c
|
||||
have_fgetsetpos.o: banned.h
|
||||
have_fgetsetpos.o: have_ban_pragma.h
|
||||
have_fgetsetpos.o: have_fgetsetpos.c
|
||||
have_fpos_pos.o: banned.h
|
||||
have_fpos_pos.o: have_ban_pragma.h
|
||||
have_fpos_pos.o: have_fpos.h
|
||||
have_fpos_pos.o: have_fgetsetpos.h
|
||||
have_fpos_pos.o: have_fpos_pos.c
|
||||
have_fpos_pos.o: have_posscl.h
|
||||
have_getpgid.o: banned.h
|
||||
@@ -6292,7 +6312,7 @@ have_offscl.o: have_offscl.c
|
||||
have_offscl.o: have_unistd.h
|
||||
have_posscl.o: banned.h
|
||||
have_posscl.o: have_ban_pragma.h
|
||||
have_posscl.o: have_fpos.h
|
||||
have_posscl.o: have_fgetsetpos.h
|
||||
have_posscl.o: have_posscl.c
|
||||
have_posscl.o: have_unistd.h
|
||||
have_rusage.o: banned.h
|
||||
@@ -6656,7 +6676,7 @@ opcodes.o: func.h
|
||||
opcodes.o: hash.h
|
||||
opcodes.o: have_ban_pragma.h
|
||||
opcodes.o: have_const.h
|
||||
opcodes.o: have_fpos.h
|
||||
opcodes.o: have_fgetsetpos.h
|
||||
opcodes.o: have_memmv.h
|
||||
opcodes.o: have_newstr.h
|
||||
opcodes.o: have_stdlib.h
|
||||
@@ -7109,7 +7129,7 @@ value.o: func.h
|
||||
value.o: hash.h
|
||||
value.o: have_ban_pragma.h
|
||||
value.o: have_const.h
|
||||
value.o: have_fpos.h
|
||||
value.o: have_fgetsetpos.h
|
||||
value.o: have_memmv.h
|
||||
value.o: have_newstr.h
|
||||
value.o: have_stdlib.h
|
||||
|
118
Makefile.simple
118
Makefile.simple
@@ -220,14 +220,14 @@ LONG_BITS=
|
||||
# Determine if we have the ANSI C fgetpos and fsetpos alternate interface
|
||||
# to the ftell() and fseek() (with whence set to SEEK_SET) functions.
|
||||
#
|
||||
# If HAVE_FPOS is empty, this Makefile will run the have_fpos program
|
||||
# to determine if there is are fgetpos and fsetpos functions. If HAVE_FPOS
|
||||
# is set to -DHAVE_NO_FPOS, then calc will use ftell() and fseek().
|
||||
# If HAVE_FGETSETPOS is empty, this Makefile will run the have_fpos program
|
||||
# to determine if there is are fgetpos and fsetpos functions. If HAVE_FGETSETPOS
|
||||
# is set to -DHAVE_NO_FGETSETPOS, then calc will use ftell() and fseek().
|
||||
#
|
||||
# If in doubt, leave HAVE_FPOS empty and this Makefile will figure it out.
|
||||
# If in doubt, leave HAVE_FGETSETPOS empty and this Makefile will figure it out.
|
||||
#
|
||||
HAVE_FPOS=
|
||||
#HAVE_FPOS= -DHAVE_NO_FPOS
|
||||
HAVE_FGETSETPOS=
|
||||
#HAVE_FGETSETPOS= -DHAVE_NO_FGETSETPOS
|
||||
|
||||
# Determine if we have an __pos element of a file position (fpos_t) structure.
|
||||
#
|
||||
@@ -1151,7 +1151,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.14.1.1
|
||||
VERSION= 2.14.1.2
|
||||
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
@@ -1400,7 +1400,7 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
|
||||
# Q= echo internal Makefile actions (debug / verbose mode)
|
||||
#
|
||||
# H=@: do not report hsrc file formation progress
|
||||
# H=@ do echo hsrc file formation progress
|
||||
# H=@ echo hsrc file formation progress
|
||||
#
|
||||
# S= >/dev/null 2>&1 silence ${CC} output during hsrc file formation
|
||||
# S= full ${CC} output during hsrc file formation
|
||||
@@ -1409,7 +1409,7 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
|
||||
# E= full command stderr during hsrc file formation
|
||||
#
|
||||
# V=@: do not echo debug statements (quiet mode)
|
||||
# V=@ do echo debug statements (debug / verbose mode)
|
||||
# V=@ echo debug statements (debug / verbose mode)
|
||||
#
|
||||
#Q=
|
||||
Q=@
|
||||
@@ -1476,7 +1476,7 @@ LIB_H_SRC= alloc.h banned.h blkcpy.h block.h byteswap.h calc.h cmath.h \
|
||||
# we build these .h files during the make
|
||||
#
|
||||
BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
|
||||
fposval.h have_ban_pragma.h have_const.h have_fpos.h \
|
||||
fposval.h have_ban_pragma.h have_const.h have_fgetsetpos.h \
|
||||
have_fpos_pos.h have_getpgid.h have_getprid.h have_getsid.h \
|
||||
have_gettime.h have_memmv.h have_newstr.h have_offscl.h \
|
||||
have_posscl.h have_rusage.h have_stdlib.h have_strdup.h \
|
||||
@@ -1494,7 +1494,7 @@ BUILD_C_SRC= calcerr.c
|
||||
# There MUST be a .c for every .o in UTIL_OBJS.
|
||||
#
|
||||
UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
|
||||
have_const.c have_stdvs.c have_varvs.c fposval.c have_fpos.c \
|
||||
have_const.c have_stdvs.c have_varvs.c fposval.c have_fgetsetpos.c \
|
||||
have_fpos_pos.c have_offscl.c have_posscl.c have_memmv.c \
|
||||
have_ustat.c have_getsid.c have_getpgid.c have_environ.c \
|
||||
have_gettime.c have_getprid.c have_rusage.c have_strdup.c \
|
||||
@@ -1512,7 +1512,7 @@ UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \
|
||||
# There MUST be a .o for every .c in UTIL_C_SRC.
|
||||
#
|
||||
UTIL_OBJS= endian.o longbits.o have_newstr.o have_uid_t.o \
|
||||
have_const.o fposval.o have_fpos.o have_fpos_pos.o \
|
||||
have_const.o fposval.o have_fgetsetpos.o have_fpos_pos.o \
|
||||
try_strarg.o have_stdvs.o have_varvs.o have_posscl.o have_memmv.o \
|
||||
have_ustat.o have_getsid.o have_getpgid.o have_environ.o \
|
||||
have_gettime.o have_getprid.o ver_calc.o have_rusage.o have_strdup.o \
|
||||
@@ -2490,7 +2490,7 @@ terminal.h: ${MAKE_FILE} ${LOC_MKF}
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
have_fgetsetpos.h: have_fgetsetpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} ${RM} -f fpos_tmp $@
|
||||
${H} echo 'forming $@'
|
||||
${Q} echo '/*' > $@
|
||||
@@ -2498,29 +2498,29 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} echo ' */' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '#if !defined(CALC_HAVE_FPOS_H)' >> $@
|
||||
${Q} echo '#define CALC_HAVE_FPOS_H' >> $@
|
||||
${Q} echo '#if !defined(CALC_HAVE_FGETSETPOS_H)' >> $@
|
||||
${Q} echo '#define CALC_HAVE_FGETSETPOS_H' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '/* do we have fgetpos & fsetpos functions? */' >> $@
|
||||
${Q} ${RM} -f have_fpos.o have_fpos${EXT}
|
||||
-${Q} ${LCC} ${HAVE_FPOS} ${ICFLAGS} have_fpos.c -c ${S} \
|
||||
${Q} ${RM} -f have_fgetsetpos.o have_fpos${EXT}
|
||||
-${Q} ${LCC} ${HAVE_FGETSETPOS} ${ICFLAGS} have_fgetsetpos.c -c ${S} \
|
||||
|| ${TRUE}
|
||||
-${Q} ${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos${EXT} ${S} \
|
||||
-${Q} ${LCC} ${ILDFLAGS} have_fgetsetpos.o -o have_fpos${EXT} ${S} \
|
||||
|| ${TRUE}
|
||||
-${Q} ./have_fpos${EXT} > fpos_tmp ${E} \
|
||||
|| ${TRUE}
|
||||
-${Q} if [ -s fpos_tmp ]; then \
|
||||
${CAT} fpos_tmp >> $@; \
|
||||
else \
|
||||
echo '#undef HAVE_FPOS /* no */' >> $@; \
|
||||
echo '#undef HAVE_FGETSETPOS /* no */' >> $@; \
|
||||
echo '' >> $@; \
|
||||
echo 'typedef long FILEPOS;' >> $@; \
|
||||
fi
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '#endif /* !CALC_HAVE_FPOS_H */' >> $@
|
||||
${Q} ${RM} -f have_fpos${EXT} have_fpos.o fpos_tmp
|
||||
${Q} echo '#endif /* !CALC_HAVE_FGETSETPOS_H */' >> $@
|
||||
${Q} ${RM} -f have_fpos${EXT} have_fgetsetpos.o fpos_tmp
|
||||
${H} echo '$@ formed'
|
||||
-@if [ -z "${Q}" ]; then \
|
||||
echo ''; \
|
||||
@@ -2532,7 +2532,7 @@ have_fpos.h: have_fpos.c banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
|
||||
have_fpos_pos.h: have_fpos_pos.c have_fgetsetpos.h have_posscl.h \
|
||||
banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} ${RM} -f fpos_tmp $@
|
||||
${H} echo 'forming $@'
|
||||
@@ -2545,9 +2545,9 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
|
||||
${Q} echo '#define CALC_HAVE_FPOS_POS_H' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '' >> $@
|
||||
${Q} echo '/* do we have fgetpos & fsetpos functions? */' >> $@
|
||||
${Q} echo '/* do we have an __pos element in FILEPOS? */' >> $@
|
||||
${Q} ${RM} -f have_fpos_pos.o have_fpos_pos${EXT}
|
||||
-${Q} ${LCC} ${HAVE_FPOS} ${HAVE_FPOS_POS} ${ICFLAGS} \
|
||||
-${Q} ${LCC} ${HAVE_FGETSETPOS} ${HAVE_FPOS_POS} ${ICFLAGS} \
|
||||
have_fpos_pos.c -c ${S} \
|
||||
|| ${TRUE}
|
||||
-${Q} ${LCC} ${ILDFLAGS} have_fpos_pos.o -o have_fpos_pos${EXT} ${S} \
|
||||
@@ -2576,7 +2576,7 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h \
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
|
||||
fposval.h: fposval.c have_fgetsetpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
|
||||
endian_calc.h banned.h have_ban_pragma.h fposval.h.def alloc.h \
|
||||
have_newstr.h have_memmv.h have_string.h have_const.h have_string.h \
|
||||
have_unused.h ${MAKE_FILE} ${LOC_MKF}
|
||||
@@ -2704,7 +2704,7 @@ have_offscl.h: have_offscl.c have_unistd.h \
|
||||
${TRUE}; \
|
||||
fi
|
||||
|
||||
have_posscl.h: have_posscl.c have_fpos.h have_unistd.h \
|
||||
have_posscl.h: have_posscl.c have_fgetsetpos.h have_unistd.h \
|
||||
banned.h have_ban_pragma.h ${MAKE_FILE} ${LOC_MKF}
|
||||
${Q} ${RM} -f have_posscl have_posscl.o posscl_tmp $@
|
||||
${H} echo 'forming $@'
|
||||
@@ -3989,11 +3989,14 @@ chk: ./cal/regress.cal
|
||||
# * print major Makefile variables
|
||||
# * build anything not yet built
|
||||
#
|
||||
# make debug:
|
||||
# make full_debug:
|
||||
# * remove everything that was previously built
|
||||
# * print major Makefile variables
|
||||
# * make everything
|
||||
# * run the regression tests
|
||||
#
|
||||
# make debug:
|
||||
# * run 'make full_debug' and write stdout and stderr to debug.out
|
||||
###
|
||||
|
||||
calcinfo:
|
||||
@@ -4110,7 +4113,7 @@ env:
|
||||
@echo 'HAVE_ARC4RANDOM=${HAVE_ARC4RANDOM}'; echo ''
|
||||
@echo 'HAVE_CONST=${HAVE_CONST}'; echo ''
|
||||
@echo 'HAVE_ENVIRON=${HAVE_ENVIRON}'; echo ''
|
||||
@echo 'HAVE_FPOS=${HAVE_FPOS}'; echo ''
|
||||
@echo 'HAVE_FGETSETPOS=${HAVE_FGETSETPOS}'; echo ''
|
||||
@echo 'HAVE_FPOS_POS=${HAVE_FPOS_POS}'; echo ''
|
||||
@echo 'HAVE_GETPGID=${HAVE_GETPGID}'; echo ''
|
||||
@echo 'HAVE_GETPRID=${HAVE_GETPRID}'; echo ''
|
||||
@@ -4226,45 +4229,58 @@ env:
|
||||
mkdebug: env version.c
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
@echo '=-=-=-= Contents of ${LOC_MKF} follows =-=-=-='
|
||||
@${CAT} ${LOC_MKF}
|
||||
-@${CAT} ${LOC_MKF}
|
||||
@echo '=-=-=-= End of contents of ${LOC_MKF} =-=-=-='
|
||||
@echo '=-=-=-= Determining the source version =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
|
||||
-@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
|
||||
-@./ver_calc${EXT}
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ all
|
||||
@${MAKE} -f Makefile Q= H=@ S= E= V=@ all
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Determining the binary version =-=-=-='
|
||||
-@./calc${EXT} -e -q -v
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
debug: calcinfo env
|
||||
full_debug: calcinfo env
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
|
||||
@echo '=-=-=-= Contents of ${LOC_MKF} follows =-=-=-='
|
||||
@${CAT} ${LOC_MKF}
|
||||
-@${CAT} ${LOC_MKF}
|
||||
@echo '=-=-=-= End of contents of ${LOC_MKF} =-=-=-='
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ clobber
|
||||
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ clobber
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-='
|
||||
@echo '=-=-= this may take a bit of time =-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ all
|
||||
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ all
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Determining the source version =-=-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
|
||||
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ ver_calc${EXT}
|
||||
-@./ver_calc${EXT}
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@${ECHON} '=-=-=-= Print #defile values if custom functions '
|
||||
-@${ECHON} '=-=-=-= Print #defile values if custom functions '
|
||||
@echo 'are allowed =-=-=-='
|
||||
-@${CALC_ENV} ./calc${EXT} -e -q -C 'print custom("sysinfo", 2);'
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ check =-=-=-='
|
||||
@echo '=-=-= this may take a while =-=-='
|
||||
@${MAKE} -f Makefile Q= V=@ check
|
||||
-@${MAKE} -f Makefile Q= V=@ check
|
||||
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
|
||||
@echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
|
||||
|
||||
debug:
|
||||
-${RM} -f debug.out
|
||||
-${MAKE} -f Makefile full_debug 2>&1 | ${TEE} debug.out
|
||||
@echo
|
||||
@echo 'To file a bug report / open a GitHub Issue, visit:'
|
||||
@echo
|
||||
@echo ' https://github.com/lcn2/calc/issues'
|
||||
@echo
|
||||
@echo 'Click the ((New issue)) button to file a bug report.'
|
||||
@echo
|
||||
@echo 'Please attch the debug.out file to the bug report.'
|
||||
@echo
|
||||
|
||||
###
|
||||
#
|
||||
# testing rules
|
||||
@@ -4415,6 +4431,7 @@ olduninstall:
|
||||
-${RMDIR} /usr/local/bin/cscript
|
||||
${RM} -f inst_files
|
||||
${RM} -f ${CALC_INCDIR}/calcerr.c
|
||||
${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
|
||||
|
||||
tags: ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} ${MAKE_FILE}
|
||||
-${CTAGS} ${CALCSRC} ${LIBSRC} ${H_SRC} ${BUILD_H_SRC} 2>&1 | \
|
||||
@@ -4781,6 +4798,9 @@ install: ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all custom/Makefile
|
||||
fi
|
||||
${V} # NOTE: misc install cleanup
|
||||
${Q} ${RM} -f tmp
|
||||
${V} # NOTE: have_fgetsetpos.h has been renamed to have_fgetsetpos.h so we
|
||||
${V} # remove the old have_fgetsetpos.h include file.
|
||||
${Q} ${RM} -f ${CALC_INCDIR}/have_fgetsetpos.h
|
||||
${V} # NOTE: remove the calcerr.c that was installed by mistake
|
||||
${V} # under ${INC_DIR} in calc v2.12.9.1
|
||||
${Q} ${RM} -f ${T}${CALC_INCDIR}/calcerr.c
|
||||
@@ -5117,7 +5137,7 @@ blkcpy.o: file.h
|
||||
blkcpy.o: hash.h
|
||||
blkcpy.o: have_ban_pragma.h
|
||||
blkcpy.o: have_const.h
|
||||
blkcpy.o: have_fpos.h
|
||||
blkcpy.o: have_fgetsetpos.h
|
||||
blkcpy.o: have_memmv.h
|
||||
blkcpy.o: have_newstr.h
|
||||
blkcpy.o: have_stdlib.h
|
||||
@@ -5405,7 +5425,7 @@ file.o: fposval.h
|
||||
file.o: hash.h
|
||||
file.o: have_ban_pragma.h
|
||||
file.o: have_const.h
|
||||
file.o: have_fpos.h
|
||||
file.o: have_fgetsetpos.h
|
||||
file.o: have_fpos_pos.h
|
||||
file.o: have_memmv.h
|
||||
file.o: have_newstr.h
|
||||
@@ -5429,7 +5449,7 @@ fposval.o: endian_calc.h
|
||||
fposval.o: fposval.c
|
||||
fposval.o: have_ban_pragma.h
|
||||
fposval.o: have_const.h
|
||||
fposval.o: have_fpos.h
|
||||
fposval.o: have_fgetsetpos.h
|
||||
fposval.o: have_fpos_pos.h
|
||||
fposval.o: have_memmv.h
|
||||
fposval.o: have_newstr.h
|
||||
@@ -5455,7 +5475,7 @@ func.o: func.h
|
||||
func.o: hash.h
|
||||
func.o: have_ban_pragma.h
|
||||
func.o: have_const.h
|
||||
func.o: have_fpos.h
|
||||
func.o: have_fgetsetpos.h
|
||||
func.o: have_memmv.h
|
||||
func.o: have_newstr.h
|
||||
func.o: have_rusage.h
|
||||
@@ -5523,12 +5543,12 @@ have_const.o: have_const.c
|
||||
have_environ.o: banned.h
|
||||
have_environ.o: have_ban_pragma.h
|
||||
have_environ.o: have_environ.c
|
||||
have_fpos.o: banned.h
|
||||
have_fpos.o: have_ban_pragma.h
|
||||
have_fpos.o: have_fpos.c
|
||||
have_fgetsetpos.o: banned.h
|
||||
have_fgetsetpos.o: have_ban_pragma.h
|
||||
have_fgetsetpos.o: have_fgetsetpos.c
|
||||
have_fpos_pos.o: banned.h
|
||||
have_fpos_pos.o: have_ban_pragma.h
|
||||
have_fpos_pos.o: have_fpos.h
|
||||
have_fpos_pos.o: have_fgetsetpos.h
|
||||
have_fpos_pos.o: have_fpos_pos.c
|
||||
have_fpos_pos.o: have_posscl.h
|
||||
have_getpgid.o: banned.h
|
||||
@@ -5560,7 +5580,7 @@ have_offscl.o: have_offscl.c
|
||||
have_offscl.o: have_unistd.h
|
||||
have_posscl.o: banned.h
|
||||
have_posscl.o: have_ban_pragma.h
|
||||
have_posscl.o: have_fpos.h
|
||||
have_posscl.o: have_fgetsetpos.h
|
||||
have_posscl.o: have_posscl.c
|
||||
have_posscl.o: have_unistd.h
|
||||
have_rusage.o: banned.h
|
||||
@@ -5924,7 +5944,7 @@ opcodes.o: func.h
|
||||
opcodes.o: hash.h
|
||||
opcodes.o: have_ban_pragma.h
|
||||
opcodes.o: have_const.h
|
||||
opcodes.o: have_fpos.h
|
||||
opcodes.o: have_fgetsetpos.h
|
||||
opcodes.o: have_memmv.h
|
||||
opcodes.o: have_newstr.h
|
||||
opcodes.o: have_stdlib.h
|
||||
@@ -6377,7 +6397,7 @@ value.o: func.h
|
||||
value.o: hash.h
|
||||
value.o: have_ban_pragma.h
|
||||
value.o: have_const.h
|
||||
value.o: have_fpos.h
|
||||
value.o: have_fgetsetpos.h
|
||||
value.o: have_memmv.h
|
||||
value.o: have_newstr.h
|
||||
value.o: have_stdlib.h
|
||||
|
48
byteswap.c
48
byteswap.c
@@ -40,7 +40,7 @@
|
||||
* dest - pointer to where the swapped src will be put or
|
||||
* NULL to allocate the storage
|
||||
* src - pointer to a HALF array to swap
|
||||
* len - length of the src HALF array
|
||||
* len - length of the src HALF array in HALFs
|
||||
*
|
||||
* returns:
|
||||
* pointer to where the swapped src has been put
|
||||
@@ -276,7 +276,7 @@ swap_b8_in_COMPLEX(COMPLEX *dest, COMPLEX *src, BOOL all)
|
||||
* dest - pointer to where the swapped src will be put or
|
||||
* NULL to allocate the storage
|
||||
* src - pointer to a HALF array to swap
|
||||
* len - length of the src HALF array
|
||||
* len - length of the src HALF array in HALFs
|
||||
*
|
||||
* returns:
|
||||
* pointer to where the swapped src has been put
|
||||
@@ -309,6 +309,50 @@ swap_b16_in_HALFs(HALF *dest, HALF *src, LEN len)
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* swap_HALFs - swap HALFs in an array of HALFs
|
||||
*
|
||||
* given:
|
||||
* dest - pointer to where the swapped src will be put or
|
||||
* NULL to allocate the storage
|
||||
* src - pointer to a HALF array to swap
|
||||
* len - length of the src HALF array in HALFs
|
||||
*
|
||||
* returns:
|
||||
* pointer to where the swapped src has been put
|
||||
*/
|
||||
HALF *
|
||||
swap_HALFs(HALF *dest, HALF *src, LEN len)
|
||||
{
|
||||
HALF *s; /* src swap pointer */
|
||||
HALF *d; /* dest swap pointer */
|
||||
HALF *ret;
|
||||
LEN i;
|
||||
|
||||
/*
|
||||
* allocate storage if needed
|
||||
*/
|
||||
if (dest == NULL) {
|
||||
dest = alloc(len);
|
||||
}
|
||||
ret = dest;
|
||||
|
||||
/*
|
||||
* swap HALFs in the array
|
||||
*/
|
||||
s = src;
|
||||
d = &dest[len-1];
|
||||
for (i=0; i < len; ++i, --d, ++s) {
|
||||
*d = *s;
|
||||
}
|
||||
|
||||
/*
|
||||
* return the result
|
||||
*/
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* swap_b16_in_ZVALUE - swap 16 bits in a ZVALUE
|
||||
*
|
||||
|
@@ -474,7 +474,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.14.1.1
|
||||
VERSION= 2.14.1.2
|
||||
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
|
@@ -445,7 +445,7 @@ EXT=
|
||||
|
||||
# The default calc versions
|
||||
#
|
||||
VERSION= 2.14.1.1
|
||||
VERSION= 2.14.1.2
|
||||
|
||||
# Names of shared libraries with versions
|
||||
#
|
||||
|
6
file.c
6
file.c
@@ -39,7 +39,7 @@
|
||||
#include "calc.h"
|
||||
#include "alloc.h"
|
||||
#include "longbits.h"
|
||||
#include "have_fpos.h"
|
||||
#include "have_fgetsetpos.h"
|
||||
#include "have_fpos_pos.h"
|
||||
#include "fposval.h"
|
||||
#include "file.h"
|
||||
@@ -1459,7 +1459,7 @@ z2filepos(ZVALUE zpos)
|
||||
if (zpos.len >= FILEPOS_BITS/BASEB) {
|
||||
/* copy the lower FILEPOS_BITS of the ZVALUE */
|
||||
memset(&tmp, 0, sizeof(tmp)); /* FILEPOS could be non-scalar */
|
||||
memcpy(&tmp, zpos.v, MIN(sizeof(tmp), FILEPOS_LEN);
|
||||
memcpy(&tmp, zpos.v, MIN(sizeof(tmp), FILEPOS_LEN));
|
||||
} else {
|
||||
/* copy what bits we can into the temp value */
|
||||
memset(&tmp, 0, sizeof(tmp)); /* FILEPOS could be non-scalar */
|
||||
@@ -2022,7 +2022,7 @@ showfiles(void)
|
||||
math_chr('\n');
|
||||
continue;
|
||||
}
|
||||
printf(" size = %lld\n", (long long int)sizes[i]);
|
||||
printf(" size = %ld\n", (long int)sizes[i]);
|
||||
for (j = i + 1; j < idnum; j++) {
|
||||
if (listed[j] || sizes[j] == -1)
|
||||
continue;
|
||||
|
6
file.h
6
file.h
@@ -32,9 +32,9 @@
|
||||
|
||||
|
||||
#if defined(CALC_SRC) /* if we are building from the calc source tree */
|
||||
# include "have_fpos.h"
|
||||
# include "have_fgetsetpos.h"
|
||||
#else
|
||||
# include <calc/have_fpos.h>
|
||||
# include <calc/have_fgetsetpos.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ typedef struct {
|
||||
* Some obscure systems without fgetpos/fsetpos may not have a simple
|
||||
* scalar type. In these cases the f_tell macro below will fail.
|
||||
*/
|
||||
#if defined(HAVE_FPOS)
|
||||
#if defined(HAVE_FGETSETPOS)
|
||||
|
||||
#define f_seek_set(stream, loc) fsetpos((FILE*)(stream), (FILEPOS*)(loc))
|
||||
#define f_tell(stream, loc) fgetpos((FILE*)(stream), (FILEPOS*)(loc))
|
||||
|
27
fposval.c
27
fposval.c
@@ -64,7 +64,7 @@
|
||||
# include <string.h>
|
||||
#endif
|
||||
#include "decl.h"
|
||||
#include "have_fpos.h"
|
||||
#include "have_fgetsetpos.h"
|
||||
#include "endian_calc.h"
|
||||
#include "have_offscl.h"
|
||||
#include "have_posscl.h"
|
||||
@@ -96,7 +96,7 @@ main(int UNUSED(argc), char **argv)
|
||||
/*
|
||||
* print the file position information
|
||||
*/
|
||||
#if defined(HAVE_FPOS_POS)
|
||||
#if defined(HAVE_FPOS_POS) && defined(FPOS_POS_BITS)
|
||||
fileposlen = FPOS_POS_BITS;
|
||||
#else /* ! HAVE_FPOS_POS */
|
||||
# if defined(FPOS_BITS)
|
||||
@@ -114,13 +114,17 @@ main(int UNUSED(argc), char **argv)
|
||||
* Big Endian
|
||||
*/
|
||||
if (fileposlen == 64) {
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
|
||||
"SWAP_HALF_IN_B64(dest, src)");
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
|
||||
"\tSWAP_HALF_IN_B64(dest, src)\n");
|
||||
} else if (fileposlen == 32) {
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
|
||||
"SWAP_HALF_IN_B32(dest, src)");
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
|
||||
"\tSWAP_HALF_IN_B32(dest, src)\n");
|
||||
} else if (fileposlen%BASEB == 0) {
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
|
||||
"\tswap_HALFs(dest, src, %d)\n",
|
||||
fileposlen/BASEB);
|
||||
} else {
|
||||
fprintf(stderr, "%s: unexpected FILEPOS bit size: %d\n",
|
||||
fprintf(stderr, "%s: unexpected BIG_ENDIAN FILEPOS bit size: %d\n",
|
||||
program, fileposlen);
|
||||
exit(1);
|
||||
}
|
||||
@@ -129,16 +133,15 @@ main(int UNUSED(argc), char **argv)
|
||||
* Little Endian
|
||||
*/
|
||||
#if defined(HAVE_FILEPOS_SCALAR)
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t\t%s\n",
|
||||
"(*(dest) = *(src))");
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
|
||||
"\t(*(dest) = *(src))\n");
|
||||
#else /* HAVE_FILEPOS_SCALAR */
|
||||
/*
|
||||
* Normally a "(*(dest) = *(src))" would do, but on some
|
||||
* systems a FILEPOS is not a scalar hence we must memcpy.
|
||||
*/
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src)\t%s\n",
|
||||
"\\\n\tmemcpy((void *)(dest), (void *)(src), "
|
||||
"sizeof(FPOS_POS_LEN))");
|
||||
printf("#define SWAP_HALF_IN_FILEPOS(dest, src) \\\n"
|
||||
"\tmemcpy((void *)(dest), (void *)(src), FILEPOS_LEN)\n");
|
||||
#endif /* HAVE_FILEPOS_SCALAR */
|
||||
#endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
|
||||
putchar('\n');
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* have_fpos - Determine if have fgetpos and fsetpos functions
|
||||
*
|
||||
* Copyright (C) 1999,2021 Landon Curt Noll
|
||||
* Copyright (C) 1999,2021,2022 Landon Curt Noll
|
||||
*
|
||||
* Calc is open software; you can redistribute it and/or modify it under
|
||||
* the terms of the version 2.1 of the GNU Lesser General Public License
|
||||
@@ -25,10 +25,10 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* If the symbol HAVE_NO_FPOS is defined, we will output nothing.
|
||||
* If the symbol HAVE_NO_FGETSETPOS is defined, we will output nothing.
|
||||
* If we are able to compile this program, then we must have the
|
||||
* fgetpos and fsetpos functions and we will output the
|
||||
* appropriate have_fpos.h file body.
|
||||
* appropriate have_fgetsetpos.h file body.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
@@ -40,7 +40,7 @@
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
#if !defined(HAVE_NO_FPOS)
|
||||
#if !defined(HAVE_NO_FGETSETPOS)
|
||||
fpos_t pos; /* file position */
|
||||
|
||||
/* get the current position */
|
||||
@@ -49,9 +49,9 @@ main(void)
|
||||
/* set the current position */
|
||||
(void) fsetpos(stdin, &pos);
|
||||
|
||||
/* print a have_fpos.h body that says we have the functions */
|
||||
printf("#undef HAVE_FPOS\n");
|
||||
printf("#define HAVE_FPOS 1 /* yes */\n\n");
|
||||
/* print a have_fgetsetpos.h body that says we have the functions */
|
||||
printf("#undef HAVE_FGETSETPOS\n");
|
||||
printf("#define HAVE_FGETSETPOS 1 /* yes */\n\n");
|
||||
printf("typedef fpos_t FILEPOS;\n");
|
||||
#endif
|
||||
/* exit(0); */
|
@@ -24,15 +24,9 @@
|
||||
* Share and enjoy! :-) http://www.isthe.com/chongo/tech/comp/calc/
|
||||
*/
|
||||
|
||||
/*
|
||||
* If the symbol HAVE_NO_FPOS is defined, we will output nothing.
|
||||
* If the HAVE_FILEPOS_SCALAR is defined, we will output nothing.
|
||||
* If we are able to compile this program, then we must have the
|
||||
* __pos element in a non-scalar FILEPOS.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include "have_fpos.h"
|
||||
#include "have_fgetsetpos.h"
|
||||
#include "have_posscl.h"
|
||||
|
||||
|
||||
@@ -42,29 +36,43 @@
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
#if !defined(HAVE_NO_FPOS) && !defined(HAVE_FILEPOS_SCALAR)
|
||||
fpos_t pos; /* file position */
|
||||
#if defined(HAVE_FILEPOS_SCALAR)
|
||||
|
||||
/* print a __pos element in fpos_t */
|
||||
printf("#undef HAVE_FPOS_POS\n");
|
||||
printf("#define HAVE_FPOS_POS 1 /* yes */\n\n");
|
||||
|
||||
/* determine __pos element size */
|
||||
printf("#undef FPOS_POS_BITS\n");
|
||||
printf("#undef FPOS_POS_LEN\n");
|
||||
# if defined(FPOS_POS_BITS)
|
||||
printf("#define FPOS_POS_BITS %d\n", FPOS_POS_BITS);
|
||||
printf("#define FPOS_POS_LEN %d\n", int(FPOS_POS_BITS/8));
|
||||
# else
|
||||
printf("#define FPOS_POS_BITS %lu\n", sizeof(pos.__pos)*8);
|
||||
printf("#define FPOS_POS_LEN %lu\n", sizeof(pos.__pos));
|
||||
# endif
|
||||
|
||||
#else
|
||||
/* we have no __pos element */
|
||||
printf("/* HAVE_FILEPOS_SCALAR is defined, we assume FILEPOS is scalar */\n");
|
||||
printf("/* we assume we have no __pos in FILEPOS */\n");
|
||||
printf("#undef HAVE_FPOS_POS\t/* no */\n");
|
||||
printf("#undef FPOS_POS_BITS\n");
|
||||
printf("#undef FPOS_POS_LEN\n");
|
||||
|
||||
#else
|
||||
|
||||
printf("/* HAVE_FILEPOS_SCALAR is undefined, we assume FILEPOS is not scalar */\n");
|
||||
# if defined(HAVE_NO_FPOS_POS)
|
||||
printf("/* HAVE_NO_FPOS_POS defiled, we assume we have no __pos in FILEPOS */\n");
|
||||
printf("#undef HAVE_FPOS_POS\t/* no */\n");
|
||||
printf("#undef FPOS_POS_BITS\n");
|
||||
printf("#undef FPOS_POS_LEN\n");
|
||||
|
||||
# elif defined(FPOS_POS_BITS)
|
||||
printf("/* FPOS_POS_BITS defiled, assume we have __pos in FILEPOS */\n");
|
||||
printf("#undef HAVE_FPOS_POS\n");
|
||||
printf("#define HAVE_FPOS_POS 1 /* yes */\n");
|
||||
printf("#undef FPOS_POS_BITS\n");
|
||||
printf("#define FPOS_POS_BITS %d\n", FPOS_POS_BITS);
|
||||
printf("#undef FPOS_POS_LEN\n");
|
||||
printf("#define FPOS_POS_LEN %d\n", int(FPOS_POS_BITS/8));
|
||||
# else
|
||||
fpos_t pos; /* file position */
|
||||
|
||||
memset(&pos, 0, sizeof(pos)); /* zeroize pos to "set it" */
|
||||
printf("/* we successfully compiled with a fpos_t type wit an __pos element */\n");
|
||||
printf("#undef HAVE_FPOS_POS\n");
|
||||
printf("#define HAVE_FPOS_POS 1 /* yes */\n");
|
||||
printf("#undef FPOS_POS_BITS\n");
|
||||
printf("#define FPOS_POS_BITS %lu\n", sizeof(pos.__pos)*8);
|
||||
printf("#undef FPOS_POS_LEN\n");
|
||||
printf("#define FPOS_POS_LEN %lu\n", sizeof(pos.__pos));
|
||||
# endif
|
||||
#endif
|
||||
/* exit(0); */
|
||||
return 0;
|
||||
|
@@ -48,7 +48,7 @@
|
||||
#if defined(HAVE_UNISTD_H)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include "have_fpos.h"
|
||||
#include "have_fgetsetpos.h"
|
||||
|
||||
|
||||
#include "banned.h" /* include after system header <> includes */
|
||||
|
@@ -38,7 +38,7 @@
|
||||
#include "file.h"
|
||||
#include "zrand.h"
|
||||
#include "zrandom.h"
|
||||
#include "have_fpos.h"
|
||||
#include "have_fgetsetpos.h"
|
||||
#include "custom.h"
|
||||
#include "lib_calc.h"
|
||||
#include "block.h"
|
||||
|
@@ -84,7 +84,7 @@ static char *program;
|
||||
#define MAJOR_VER 2 /* major library version */
|
||||
#define MINOR_VER 14 /* minor library version */
|
||||
#define MAJOR_PATCH 1 /* major software version level */
|
||||
#define MINOR_PATCH 1 /* minor software version level */
|
||||
#define MINOR_PATCH 2 /* minor software version level */
|
||||
|
||||
|
||||
/*
|
||||
|
1
zmath.h
1
zmath.h
@@ -643,6 +643,7 @@ E_FUNC void math_error(char *, ...) \
|
||||
E_FUNC HALF *swap_b8_in_HALFs(HALF *dest, HALF *src, LEN len);
|
||||
E_FUNC ZVALUE *swap_b8_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all);
|
||||
E_FUNC HALF *swap_b16_in_HALFs(HALF *dest, HALF *src, LEN len);
|
||||
E_FUNC HALF *swap_HALFs(HALF *dest, HALF *src, LEN len);
|
||||
E_FUNC ZVALUE *swap_b16_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all);
|
||||
E_FUNC ZVALUE *swap_HALF_in_ZVALUE(ZVALUE *dest, ZVALUE *src, BOOL all);
|
||||
|
||||
|
Reference in New Issue
Block a user