Skip to content

fix compile and path issues #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shoaib42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix compile and path issues #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
bin/*
lib/*
obj/*

!bin/.keep
!lib/.keep
!obj/.keep
Empty file added bin/.keep
View file
Open in desktop
Empty file.
6 changes: 4 additions & 2 deletions inc/odbc_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
#ifndef _ODBC_WRAPPER_H
#define _ODBC_WRAPPER_H

#include <my_global.h>
#include <mysql.h>
#include <my_sys.h>

// This odbc_wrapper needs unixODBC headers.
#include <sql.h>
Expand All @@ -17,6 +15,10 @@
#undef max
#undef min

#define TRUE true
#define FALSE false
#define my_bool bool

namespace TPCE
{

Expand Down
Empty file added lib/.keep
View file
Open in desktop
Empty file.
Empty file added obj/.keep
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions src/DataMaintenanceDB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,9 +530,9 @@ void CDataMaintenanceDB::DoDataMaintenanceFrame1(
SQLCloseCursor(m_Stmt);


if ((pt = strstr(tax_name, " Tax ")) > 0)
if ((pt = strstr(tax_name, " Tax ")) > (char *) 0)
pt[1] = 't';
else if ((pt = strstr(tax_name, " tax ")) > 0)
else if ((pt = strstr(tax_name, " tax ")) > (char *) 0)
pt[1] = 'T';


Expand Down