-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/db/dbconnect.sqc | 12 | ||||
-rw-r--r-- | src/util/check_error.c | 6 | ||||
-rw-r--r-- | src/util/check_error_db.c | 13 | ||||
-rw-r--r-- | src/util/check_error_db.h | 9 |
5 files changed, 36 insertions, 6 deletions
diff --git a/src/db/dbconnect.sqc b/src/db/dbconnect.sqc index 1e41a12..aab7bcb 100644 --- a/src/db/dbconnect.sqc +++ b/src/db/dbconnect.sqc | |||
@@ -1,5 +1,5 @@ | |||
1 | #include "dbconnect.h" | 1 | #include "dbconnect.h" |
2 | #include "../util/check_error.h" | 2 | #include "../util/check_error_db.h" |
3 | 3 | ||
4 | EXEC SQL INCLUDE sqlca; | 4 | EXEC SQL INCLUDE sqlca; |
5 | 5 | ||
@@ -7,5 +7,13 @@ void | |||
7 | dbconnect (void) | 7 | dbconnect (void) |
8 | { | 8 | { |
9 | EXEC SQL CONNECT TO exp004; | 9 | EXEC SQL CONNECT TO exp004; |
10 | check_error (__FILE__, __LINE__); | 10 | |
11 | /* | ||
12 | * Only check for a database error rather than using check_error to | ||
13 | * test for OpenGL and database errors. OpenGL may not yet be | ||
14 | * prepared and checking it prematurely could cause odd behavior. | ||
15 | */ | ||
16 | check_error_db (__FILE__, __LINE__); | ||
17 | |||
18 | return; | ||
11 | } | 19 | } |