Skip to content

Commit

Permalink
Remove windows ifdefs
Browse files Browse the repository at this point in the history
  • Loading branch information
mariadb-LeonidFedorov committed Mar 2, 2023
1 parent 123c345 commit 56f2346
Show file tree
Hide file tree
Showing 328 changed files with 9 additions and 19,602 deletions.
8 changes: 0 additions & 8 deletions datatypes/mcs_datatype.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,12 @@
#include <string>
#include <iostream>
#include <stack>
#ifdef _MSC_VER
#include <unordered_map>
#else
#include <tr1/unordered_map>
#endif
#include <fstream>
#include <sstream>
#include <cerrno>
#include <cstring>
#ifdef _MSC_VER
#include <unordered_set>
#else
#include <tr1/unordered_set>
#endif
#include <utility>
#include <cassert>
using namespace std;
Expand Down
7 changes: 0 additions & 7 deletions datatypes/mcs_datatype.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,12 @@
#include "mcs_double.h"
#include "mcs_longdouble.h"

#ifdef _MSC_VER
typedef int mcs_sint32_t;
#else
typedef int32_t mcs_sint32_t;
#endif

// Because including my_sys.h in a Columnstore header causes too many conflicts
struct charset_info_st;
typedef const struct charset_info_st CHARSET_INFO;

#ifdef _MSC_VER
#define __attribute__(x)
#endif

namespace
{
Expand Down
Loading

0 comments on commit 56f2346

Please sign in to comment.