Mercurial > octave-nkf
changeset 6048:53e42cafb94a
[project @ 2006-10-11 19:23:04 by jwe]
| author | jwe |
|---|---|
| date | Wed, 11 Oct 2006 19:23:04 +0000 |
| parents | 176f1c58a474 |
| children | 04c2ad6d1679 |
| files | liboctave/SparseCmplxQR.cc src/ChangeLog src/mex.h |
| diffstat | 3 files changed, 75 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/SparseCmplxQR.cc Tue Oct 10 19:13:49 2006 +0000 +++ b/liboctave/SparseCmplxQR.cc Wed Oct 11 19:23:04 2006 +0000 @@ -37,7 +37,8 @@ #define OCTAVE_C99_ZERO (0. + 0.iF); SparseComplexQR::SparseComplexQR_rep::SparseComplexQR_rep -(const SparseComplexMatrix& a, int order) +(const SparseComplexMatrix& a GCC_ATTR_UNUSED, + int order GCC_ATTR_UNUSED) { #ifdef HAVE_CXSPARSE CXSPARSE_ZNAME () A;
--- a/src/ChangeLog Tue Oct 10 19:13:49 2006 +0000 +++ b/src/ChangeLog Wed Oct 11 19:23:04 2006 +0000 @@ -1,3 +1,10 @@ +2006-10-11 John W. Eaton <jwe@octave.org> + + * mex.h (UINT64_T, uint64_T, INT64_T, int64_T, UINT32_T, uint32_T, + INT32_T, int32_T, UINT16_T, uint16_T, INT16_T, int16_T, UINT8_T, + uint8_T, INT8_T, int8_T): Conditionally define. + From Andy Adler <adler@site.uottawa.ca>. + 2006-10-09 John W. Eaton <jwe@octave.org> * oct-conf.h.in (OCTAVE_CONF_CURL_LIBS): Substitute.
--- a/src/mex.h Tue Oct 10 19:13:49 2006 +0000 +++ b/src/mex.h Wed Oct 11 19:23:04 2006 +0000 @@ -103,6 +103,72 @@ #define mxIsString mxIsChar +/* Apparently these are also defined. */ + +#ifndef UINT64_T +#define UINT64_T uint64_t +#endif + +#ifndef uint64_T +#define uint64_T uint64_t +#endif + +#ifndef INT64_T +#define INT64_T int64_t +#endif + +#ifndef int64_T +#define int64_T int64_t +#endif + +#ifndef UINT32_T +#define UINT32_T uint32_t +#endif + +#ifndef uint32_T +#define uint32_T uint32_t +#endif + +#ifndef INT32_T +#define INT32_T int32_t +#endif + +#ifndef int32_T +#define int32_T int32_t +#endif + +#ifndef UINT16_T +#define UINT16_T uint16_t +#endif + +#ifndef uint16_T +#define uint16_T uint16_t +#endif + +#ifndef INT16_T +#define INT16_T int16_t +#endif + +#ifndef int16_T +#define int16_T int16_t +#endif + +#ifndef UINT8_T +#define UINT8_T uint8_t +#endif + +#ifndef uint8_T +#define uint8_T uint8_t +#endif + +#ifndef INT8_T +#define INT8_T int8_t +#endif + +#ifndef int8_T +#define int8_T int8_t +#endif + #if defined (__cplusplus) } #endif