psyc-mirrors
/
psyclpc
mirror of git://git.psyced.org/git/psyclpc
1
0
Fork 0
Code Issues Releases Wiki Activity

BSD tweaks

This commit is contained in:
psyc://psyced.org/~lynX 2016-01-30 00:11:29 +01:00
parent 727399dbcf
commit 5af1fa2e52
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/autoconf/configure.in
View File

@ -1304,7 +1304,10 @@ if test -f /usr/sbin/iconvconfig; then
lp_cv_has_broken_iconv="no"
fi
else
lp_cv_has_broken_iconv="no"
if test -f /usr/local/bin/iconv; then
lp_cv_has_broken_iconv="no"
lp_cv_has_iconv="yes"
fi
fi
echo "$as_me:$LINENO: result: $lp_cv_has_broken_iconv" >&5
echo "${ECHO_T}$lp_cv_has_broken_iconv" >&6

14
src/bytecode.h
View File

@ -267,17 +267,19 @@ typedef bytecode_t * bytecode_p;
# define LOAD_INT32(d,p) LOAD_4BYTE(d,p)
# define STORE_INT32(p,d) STORE_4BYTE(p,d)
#else
# define GET_LONG(d,p) GET_4BYTE(d,p)
# define LOAD_LONG(d,p) LOAD_4BYTE(d,p)
# define PUT_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
# ifndef GET_LONG /* happens on BSD */
# define GET_LONG(d,p) GET_4BYTE(d,p)
# define LOAD_LONG(d,p) LOAD_4BYTE(d,p)
# define PUT_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
PUT_4BYTE(p,_us);)
# define STORE_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
# define STORE_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
STORE_4BYTE(p,_us);)
# define RSTORE_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
# define RSTORE_LONG(p,d) MACRO(unsigned long _us = (unsigned long)d; \
RSTORE_4BYTE(p,_us);)
/* TODO: The above assumes sizeof(long) == 4. */
# define LOAD_INT32(d,p) LOAD_2BYTE(d,p)
# define LOAD_INT32(d,p) LOAD_2BYTE(d,p)
# endif
#endif
#endif /* CHAR_BIT */

2
src/version.sh
View File

@ -17,7 +17,7 @@ version_longtype="stable"
# A timestamp, to be used by bumpversion and other scripts.
# It can be used, for example, to 'touch' this file on every build, thus
# forcing revision control systems to add it on every checkin automatically.
version_stamp="Fri Sep 27 22:12:45 CEST 2013"
version_stamp="Wed Jan 28 16:33:10 CET 2015"
# Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
version_major=4