Fossil SCM
Merge the solaris10 branch into the trunk.
Commit
3e0efc38279da750feba830bc72ceea3a5d03789
Parent
1343cfad7bd4a27…
2 files changed
+1
-1
+7
M
Makefile
+1
-1
| --- Makefile | ||
| +++ Makefile | ||
| @@ -58,11 +58,11 @@ | ||
| 58 | 58 | |
| 59 | 59 | # You should not need to change anything below this line |
| 60 | 60 | ############################################################################### |
| 61 | 61 | # |
| 62 | 62 | # Automatic platform-specific options. |
| 63 | -HOST_OS!= uname -s | |
| 63 | +HOST_OS :sh = uname -s | |
| 64 | 64 | |
| 65 | 65 | LIB.SunOS= -lsocket -lnsl |
| 66 | 66 | LIB += $(LIB.$(HOST_OS)) |
| 67 | 67 | |
| 68 | 68 | TCC.DragonFly += -DUSE_PREAD |
| 69 | 69 |
| --- Makefile | |
| +++ Makefile | |
| @@ -58,11 +58,11 @@ | |
| 58 | |
| 59 | # You should not need to change anything below this line |
| 60 | ############################################################################### |
| 61 | # |
| 62 | # Automatic platform-specific options. |
| 63 | HOST_OS!= uname -s |
| 64 | |
| 65 | LIB.SunOS= -lsocket -lnsl |
| 66 | LIB += $(LIB.$(HOST_OS)) |
| 67 | |
| 68 | TCC.DragonFly += -DUSE_PREAD |
| 69 |
| --- Makefile | |
| +++ Makefile | |
| @@ -58,11 +58,11 @@ | |
| 58 | |
| 59 | # You should not need to change anything below this line |
| 60 | ############################################################################### |
| 61 | # |
| 62 | # Automatic platform-specific options. |
| 63 | HOST_OS :sh = uname -s |
| 64 | |
| 65 | LIB.SunOS= -lsocket -lnsl |
| 66 | LIB += $(LIB.$(HOST_OS)) |
| 67 | |
| 68 | TCC.DragonFly += -DUSE_PREAD |
| 69 |
+7
| --- src/config.h | ||
| +++ src/config.h | ||
| @@ -82,10 +82,17 @@ | ||
| 82 | 82 | |
| 83 | 83 | #ifndef _RC_COMPILE_ |
| 84 | 84 | |
| 85 | 85 | #include "sqlite3.h" |
| 86 | 86 | |
| 87 | +/* | |
| 88 | +** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. | |
| 89 | +*/ | |
| 90 | +#if defined(__sun__) || defined(sun) | |
| 91 | + #define getpass getpassphrase | |
| 92 | +#endif | |
| 93 | + | |
| 87 | 94 | /* |
| 88 | 95 | ** Typedef for a 64-bit integer |
| 89 | 96 | */ |
| 90 | 97 | typedef sqlite3_int64 i64; |
| 91 | 98 | typedef sqlite3_uint64 u64; |
| 92 | 99 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -82,10 +82,17 @@ | |
| 82 | |
| 83 | #ifndef _RC_COMPILE_ |
| 84 | |
| 85 | #include "sqlite3.h" |
| 86 | |
| 87 | /* |
| 88 | ** Typedef for a 64-bit integer |
| 89 | */ |
| 90 | typedef sqlite3_int64 i64; |
| 91 | typedef sqlite3_uint64 u64; |
| 92 |
| --- src/config.h | |
| +++ src/config.h | |
| @@ -82,10 +82,17 @@ | |
| 82 | |
| 83 | #ifndef _RC_COMPILE_ |
| 84 | |
| 85 | #include "sqlite3.h" |
| 86 | |
| 87 | /* |
| 88 | ** On Solaris, getpass() will only return up to 8 characters. getpassphrase() returns up to 257. |
| 89 | */ |
| 90 | #if defined(__sun__) || defined(sun) |
| 91 | #define getpass getpassphrase |
| 92 | #endif |
| 93 | |
| 94 | /* |
| 95 | ** Typedef for a 64-bit integer |
| 96 | */ |
| 97 | typedef sqlite3_int64 i64; |
| 98 | typedef sqlite3_uint64 u64; |
| 99 |