diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-10-03 15:25:25 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2005-10-03 15:25:25 +0000 |
| commit | afaab9892c742f8064f003842d1c3233f9a89a3c (patch) | |
| tree | f511cfc48b2ecfd636489476036f77ea661edc9e /src/util | |
| parent | c35011922e3a3e4800e16dfc0a1d8d2c843e7d59 (diff) | |
Renaming min macro to MIN to avoid a conflict on windows.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4162 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Table.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/Table.c b/src/util/Table.c index 3dfc1648..31db8444 100644 --- a/src/util/Table.c +++ b/src/util/Table.c @@ -257,7 +257,7 @@ void **ip_array = NULL; /***** Misc Macros for This File **********************************************/ /******************************************************************************/ -#define min(x,y) ((x < y) ? (x) : (y)) +#define MIN(x,y) ((x < y) ? (x) : (y)) /******************************************************************************/ @@ -1603,7 +1603,7 @@ int Util_TableGetString(int handle, /* internal_get() should return an error */ /* if buffer != NULL and buffer_length <= 0 */ { - const int null_posn = min(string_length, buffer_length-1); + const int null_posn = MIN(string_length, buffer_length-1); buffer[null_posn] = '\0'; } } @@ -4670,7 +4670,7 @@ int Util_TableItQueryKeyValueInfo(int ihandle, if (key_buffer != NULL) { - const int N_key_copy = min(key_buffer_length-1, actual_key_length); + const int N_key_copy = MIN(key_buffer_length-1, actual_key_length); if (N_key_copy < 0) /* can only happen if key_buffer_length <= 0 */ { /* @@ -5115,7 +5115,7 @@ static return UTIL_ERROR_BAD_INPUT; } { - const int N_copy = min(N_value_buffer, tep->N_elements); + const int N_copy = MIN(N_value_buffer, tep->N_elements); const size_t sizeof_N_copy_elements = N_copy * CCTK_VarTypeSize(type_code); #ifdef UTIL_TABLE_DEBUG printf( |