Skip to content

Commit

Permalink
Merge pull request #14 from vapor/warnings
Browse files Browse the repository at this point in the history
remove warnings
  • Loading branch information
tanner0101 authored Mar 9, 2017
2 parents 2c22514 + 55363e2 commit 9ec34c5
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ sudo: required
dist: trusty
osx_image: xcode8
script:
- eval "$(curl -sL swift.qutheory.io/ci)"
- eval "$(curl -sL swift.qutheory.io/ci-3.1)"
- eval "$(curl -sL swift.qutheory.io/codecov)"
37 changes: 20 additions & 17 deletions Sources/CSQLite/sqlite3.c
Original file line number Diff line number Diff line change
Expand Up @@ -11699,10 +11699,9 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
/*
** Macros to compute minimum and maximum of two numbers.
*/
#ifndef MIN

#ifndef __APPLE__
# define MIN(A,B) ((A)<(B)?(A):(B))
#endif
#ifndef MAX
# define MAX(A,B) ((A)>(B)?(A):(B))
#endif

Expand Down Expand Up @@ -144455,12 +144454,12 @@ SQLITE_PRIVATE Fts3HashElem *sqlite3Fts3HashFindElem(const Fts3Hash *, const voi
#define SizeofArray(X) ((int)(sizeof(X)/sizeof(X[0])))


#ifndef MIN
# define MIN(x,y) ((x)<(y)?(x):(y))
#endif
#ifndef MAX
# define MAX(x,y) ((x)>(y)?(x):(y))
#endif
// #ifndef MIN
// # define MIN(x,y) ((x)<(y)?(x):(y))
// #endif
// #ifndef MAX
// # define MAX(x,y) ((x)>(y)?(x):(y))
// #endif

/*
** Maximum length of a varint encoded integer. The varint format is different
Expand Down Expand Up @@ -163297,12 +163296,12 @@ struct RtreeMatchArg {
RtreeDValue aParam[1]; /* Values for parameters to the SQL function */
};

#ifndef MAX
# define MAX(x,y) ((x) < (y) ? (y) : (x))
#endif
#ifndef MIN
# define MIN(x,y) ((x) > (y) ? (y) : (x))
#endif
// #ifndef MAX
// # define MAX(x,y) ((x) < (y) ? (y) : (x))
// #endif
// #ifndef MIN
// # define MIN(x,y) ((x) > (y) ? (y) : (x))
// #endif

/* What version of GCC is being used. 0 means GCC is not being used */
#ifndef GCC_VERSION
Expand Down Expand Up @@ -181092,8 +181091,12 @@ typedef sqlite3_uint64 u64;
#define ALWAYS(x) 1
#define NEVER(x) 0

#define MIN(x,y) (((x) < (y)) ? (x) : (y))
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
// #ifndef MIN
// #define MIN(x,y) (((x) < (y)) ? (x) : (y))
// #endif
// #ifndef MAX
// #define MAX(x,y) (((x) > (y)) ? (x) : (y))
// #endif

/*
** Constants for the largest and smallest possible 64-bit signed integers.
Expand Down
Binary file added test_database.sqlite
Binary file not shown.

0 comments on commit 9ec34c5

Please sign in to comment.