diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-11 21:06:25 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-11 21:06:25 +0000 |
| commit | 415e738feb188909dea60831aef07c4fb0fe0f17 (patch) | |
| tree | 655d59ab571962a2b3fa2fdc492bee3b83b024cc /src/common/db.c | |
| parent | d187830a9f19239d7f43729a51198ed9dd8c176f (diff) | |
| download | hercules-415e738feb188909dea60831aef07c4fb0fe0f17.tar.gz hercules-415e738feb188909dea60831aef07c4fb0fe0f17.tar.bz2 hercules-415e738feb188909dea60831aef07c4fb0fe0f17.tar.xz hercules-415e738feb188909dea60831aef07c4fb0fe0f17.zip | |
* Merged changes up to eAthena 15032.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15065 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/db.c')
| -rw-r--r-- | src/common/db.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/common/db.c b/src/common/db.c index c9b124455..74c3b1f91 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -2437,14 +2437,11 @@ DBMap* db_alloc(const char *file, int line, DBType type, DBOptions options, unsi return &db->vtable; } -#ifdef DB_MANUAL_CAST_TO_UNION /** * Manual cast from 'int' to the union DBKey. - * Created for compilers that don't support casting to unions. * @param key Key to be casted * @return The key as a DBKey union * @public - * @see #DB_MANUAL_CAST_TO_UNION */ DBKey db_i2key(int key) { @@ -2457,11 +2454,9 @@ DBKey db_i2key(int key) /** * Manual cast from 'unsigned int' to the union DBKey. - * Created for compilers that don't support casting to unions. * @param key Key to be casted * @return The key as a DBKey union * @public - * @see #DB_MANUAL_CAST_TO_UNION */ DBKey db_ui2key(unsigned int key) { @@ -2474,11 +2469,9 @@ DBKey db_ui2key(unsigned int key) /** * Manual cast from 'const char *' to the union DBKey. - * Created for compilers that don't support casting to unions. * @param key Key to be casted * @return The key as a DBKey union * @public - * @see #DB_MANUAL_CAST_TO_UNION */ DBKey db_str2key(const char *key) { @@ -2488,7 +2481,6 @@ DBKey db_str2key(const char *key) ret.str = key; return ret; } -#endif /* DB_MANUAL_CAST_TO_UNION */ /** * Initializes the database system. |