File 0922-If-the-system-imports-stdbool-that-symbol-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0922-If-the-system-imports-stdbool-that-symbol-is-used-to.patch of Package erlang (Revision 84136f040b8e10a77a20fc548a9bd409)

Currently displaying revision 84136f040b8e10a77a20fc548a9bd409 , Show latest

From 53797e33b43887db8e286d2f357fd43b10fd3a1d Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Sat, 16 May 2020 22:42:37 +0000
Subject: [PATCH 06/11] If the system imports stdbool, that symbol is used too

---
 lib/odbc/c_src/odbcserver.c | 8 ++++----
 lib/odbc/c_src/odbcserver.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index 996c122199..ee5dc9cd0a 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -1747,9 +1747,9 @@ static Boolean decode_params(db_state *state, byte *buffer, int *index, param_ar
 		return FALSE;
 	}
 	if (strncmp((char*)atomarray,"true",4) == 0)
-	    param->values.bool[j] = TRUE;
+	    param->values.boolean[j] = TRUE;
 	else if (strncmp((char*)atomarray,"false",5) == 0)
-	    param->values.bool[j] = FALSE;
+	    param->values.boolean[j] = FALSE;
 	else
 	    return -1;
 	break;
@@ -2337,7 +2337,7 @@ static void init_param_column(param_array *params, byte *buffer, int *index,
 	params->type.c = SQL_C_BIT;
 	params->type.len = sizeof(byte);
 	params->type.col_size = params->type.len;
-	params->values.bool =
+	params->values.boolean =
 		(byte *)safe_malloc(num_param_values * params->type.len);
 	break;
     }
@@ -2581,7 +2581,7 @@ static void * retrive_param_values(param_array *Param)
     case SQL_C_DOUBLE: 
 	return (void *)Param->values.floating;
     case SQL_C_BIT:
-	return (void *)Param->values.bool;
+	return (void *)Param->values.boolean;
     default:
 	DO_EXIT(EXIT_FAILURE); /* Should not happen */
     }
diff --git a/lib/odbc/c_src/odbcserver.h b/lib/odbc/c_src/odbcserver.h
index 28bb2b9030..4dc950f67e 100644
--- a/lib/odbc/c_src/odbcserver.h
+++ b/lib/odbc/c_src/odbcserver.h
@@ -158,7 +158,7 @@ typedef struct {
 	byte *string;
 	SQLINTEGER *integer;
 	double *floating;
-	byte *bool;
+	byte *boolean;
     }values;
 } param_array;
 
-- 
2.26.2

Places

File 0922-If-the-system-imports-stdbool-that-symbol-is-used-to.patch of Package erlang (Revision 84136f040b8e10a77a20fc548a9bd409)

Places