aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-04-08 22:46:46 +0000
committerMax Horn2004-04-08 22:46:46 +0000
commit650dc2117ccc00ccf45466693bb9fe5b742960f4 (patch)
tree78189b035f84ea2c1fdedf1af30029a1d613d305
parent263bd0d0e707e242bc037a2c9abe5169a1592d49 (diff)
downloadscummvm-rg350-650dc2117ccc00ccf45466693bb9fe5b742960f4.tar.gz
scummvm-rg350-650dc2117ccc00ccf45466693bb9fe5b742960f4.tar.bz2
scummvm-rg350-650dc2117ccc00ccf45466693bb9fe5b742960f4.zip
seems it is 'endianness' and not 'endianess'
svn-id: r13504
-rwxr-xr-xconfigure24
-rw-r--r--scumm/script_v6.cpp2
-rw-r--r--sound/mixer.h4
3 files changed, 15 insertions, 15 deletions
diff --git a/configure b/configure
index 3863080a1a..b25e87c49b 100755
--- a/configure
+++ b/configure
@@ -479,7 +479,7 @@ if test -n "$_host"; then
linupy)
echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
DEFINES="$DEFINES -DUNIX"
- _def_endianess='#define SCUMM_LITTLE_ENDIAN'
+ _def_endianness='#define SCUMM_LITTLE_ENDIAN'
_def_align='#define SCUMM_NEED_ALIGNMENT'
_def_linupy="#define DLINUPY"
type_1_byte='char'
@@ -532,10 +532,10 @@ else
esac
#
- # Check for endianess
+ # Check for endianness
#
- echo_n "Checking endianess... "
- cat <<EOF >tmp_endianess_check.cpp
+ echo_n "Checking endianness... "
+ cat <<EOF >tmp_endianness_check.cpp
#include <stdio.h>
#include <stdlib.h>
int main(int argc, char **argv)
@@ -551,21 +551,21 @@ int main(int argc, char **argv)
return 0;
}
EOF
- $CXX -o tmp_endianess_check tmp_endianess_check.cpp
- endianess=`./tmp_endianess_check`
- echo $endianess;
- case $endianess in
+ $CXX -o tmp_endianness_check tmp_endianness_check.cpp
+ endianness=`./tmp_endianness_check`
+ echo $endianness;
+ case $endianness in
big)
- _def_endianess='#define SCUMM_BIG_ENDIAN'
+ _def_endianness='#define SCUMM_BIG_ENDIAN'
;;
little)
- _def_endianess='#define SCUMM_LITTLE_ENDIAN'
+ _def_endianness='#define SCUMM_LITTLE_ENDIAN'
;;
*)
exit 1
;;
esac
- rm -f tmp_endianess_check tmp_endianess_check.cpp
+ rm -f tmp_endianness_check tmp_endianness_check.cpp
#
# Check whether memory alignment is required
@@ -875,7 +875,7 @@ cat > config.h << EOF
#ifndef CONFIG_H
#define CONFIG_H
-$_def_endianess
+$_def_endianness
$_def_align
$_def_linupy
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 169e6ae12e..743c75038d 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -478,7 +478,7 @@ ArrayHeader *ScummEngine_v6::getArray(int array) {
return 0;
// Workaround for a long standing bug where we save array headers in native
- // endianess, instead of a fixed endianess. We try to detect savegames
+ // endianness, instead of a fixed endianness. We try to detect savegames
// which were created on a big endian system and convert them to little
// endian.
if ((ah->dim1 & 0xF000) || (ah->dim2 & 0xF000) || (ah->type & 0xFF00)) {
diff --git a/sound/mixer.h b/sound/mixer.h
index a559e3faa7..1ab0360b24 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -98,8 +98,8 @@ public:
* it needs to generate any data, before any other mixing takes place. The
* premixer than has a chanve to fill the mix buffer with data (usually
* music samples). It should generate the specified number of 16bit stereo
- * samples (i.e. len * 4 bytes). The endianess of these samples shall be
- * the native endianess.
+ * samples (i.e. len * 4 bytes). The endianness of these samples shall be
+ * the native endianness.
*/
void setupPremix(PremixProc *proc, void *param);