diff options
| author | Paul Lindner <plindner@hi5.com> | 2007-06-20 01:21:45 +0000 |
|---|---|---|
| committer | Paul Lindner <plindner@hi5.com> | 2007-06-20 01:21:45 +0000 |
| commit | 61f543a5b82550ac1c8f3440a920d1e0e21c4472 (patch) | |
| tree | b51ca5bea4f879a2d9ae395587a22e620e69204d | |
| parent | 25f5df149ffceb8e3dd10a6fdc1d895a8b0b56cf (diff) | |
| download | memcached-61f543a5b82550ac1c8f3440a920d1e0e21c4472.tar.gz | |
Solaris portability fixes from Trond Norbye
git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@570 b0b603af-a30f-0410-a34e-baf09ae79d0b
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | memcached.c | 2 | ||||
| -rw-r--r-- | memcached.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2007-06-19 Paul Lindner <lindner@mirth.inuus.com> + + * Solaris portability fixes from Trond Norbye + 2007-05-29 Paul Lindner <lindner@mirth.inuus.com> * Properly document evictions statistic value diff --git a/memcached.c b/memcached.c index 3750c16..1653268 100644 --- a/memcached.c +++ b/memcached.c @@ -812,7 +812,7 @@ static size_t tokenize_command(char *command, token_t *tokens, const size_t max_ return ntokens; } -inline void process_stats_detail(conn *c, const char *command) { +inline static void process_stats_detail(conn *c, const char *command) { assert(c != NULL); if (strcmp(command, "on") == 0) { diff --git a/memcached.h b/memcached.h index bb16874..dc632cd 100644 --- a/memcached.h +++ b/memcached.h @@ -108,7 +108,7 @@ typedef struct _stritem { uint8_t it_flags; /* ITEM_* above */ uint8_t slabs_clsid;/* which slab class we're in */ uint8_t nkey; /* key length, w/terminating null and padding */ - void * end[0]; + void * end[]; /* then null-terminated key */ /* then " flags length\r\n" (no terminating null) */ /* then data with terminating \r\n (no terminating null; it's binary!) */ |