Author: muggenhor
Date: Fri May 2 14:24:03 2008
New Revision: 4877
URL: http://svn.gna.org/viewcvs/warzone?rev=4877&view=rev
Log:
Merged revisions r4865 and r4871:4876 into the 2.1 branch via svnmerge from
trunk
........
r4865 | per | 2008-04-30 19:26:38 +0200 (wo, 30 apr 2008) | 5 lines
Rename astrlcpy and astrlcat to sstrcpy and sstrcat. Add ssprintf and sstrcmp
also.
Renaming due to name conflict with a gnu extension. Added debug versions of
all the
above, that assert if a char* pointer is passed in. This means they cannot be
used
with strings shorter than the shortest expected length of void*.
........
r4871 | muggenhor | 2008-05-01 21:47:16 +0200 (do, 01 mei 2008) | 1 line
Fix Code::Blocks projectfile
........
r4872 | muggenhor | 2008-05-01 22:00:13 +0200 (do, 01 mei 2008) | 3 lines
Less bitfucking:
* Don't store whether a research item is possible in a bitflag; use a
boolean instead
* Use functions instead of macros to access research->possible
........
r4873 | muggenhor | 2008-05-01 22:25:20 +0200 (do, 01 mei 2008) | 2 lines
* Use a nice & easy to maintain string to enum mapping-array and utilise a
for-loop to fetch the correct value from it (instead of a huge amount of code
repetition)
* Some const correctness
........
r4874 | muggenhor | 2008-05-01 22:50:30 +0200 (do, 01 mei 2008) | 1 line
Minor cleanup
........
r4875 | muggenhor | 2008-05-02 00:54:37 +0200 (vr, 02 mei 2008) | 1 line
Remove non existent files platform.h and dbghelp.h from the Code::Blocks
projectfile
........
r4876 | muggenhor | 2008-05-02 14:04:20 +0200 (vr, 02 mei 2008) | 3 lines
Detect whether the OS already supplies strlcpy and strlcat and don't define
our own if it does:
* Add m4 macros AC_STRLCPY_CHECK and AC_STRLCAT_CHECK for use in the
autoconf script
* Don't define our implementation when HAVE_STRLCPY or HAVE_STRLCAT is
defined
........
Modified:
branches/2.1/ (props changed)
branches/2.1/configure.ac
branches/2.1/lib/framework/strlfuncs.h
branches/2.1/src/aiexperience.c
branches/2.1/src/cheat.c
branches/2.1/src/clparse.c
branches/2.1/src/configuration.c
branches/2.1/src/console.c
branches/2.1/src/data.c
branches/2.1/src/design.c
branches/2.1/src/droid.c
branches/2.1/src/game.c
branches/2.1/src/researchdef.h
branches/2.1/src/structure.c
branches/2.1/warzone2100.cbp
_______________________________________________
Warzone-commits mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-commits
