Skip to content

Commit

Permalink
Merge 0de9e98 into 7cc5b24
Browse files Browse the repository at this point in the history
  • Loading branch information
jackgerrits committed Feb 13, 2020
2 parents 7cc5b24 + 0de9e98 commit ec75266
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion vowpalwabbit/io_buf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// license as described in the file LICENSE.
#include "io_buf.h"
#include <cstdio>
#ifdef WIN32
#ifdef _WIN32
#include <winsock2.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion vowpalwabbit/lda_core.cc
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ inline v4sf v4sfl(const float x) { return _mm_set1_ps(x); }

inline v4si v4sil(const uint32_t x) { return _mm_set1_epi32(x); }

#ifdef WIN32
#ifdef _WIN32

inline __m128 operator+(const __m128 a, const __m128 b) { return _mm_add_ps(a, b); }

Expand Down
4 changes: 2 additions & 2 deletions vowpalwabbit/vwdll.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#pragma once

// indirect the Win32 so non win32 Microsoft C programs can work
#ifdef WIN32
#ifdef _WIN32
#define MS_CONV // use Microsoft library calling conventions
#endif

// enable wide character (32 bit) versions of functions
// these are optional since other compilers may not have wide to narrow char libarray facilities built in.
#ifdef WIN32
#ifdef _WIN32
#define USE_CODECVT
#endif

Expand Down

0 comments on commit ec75266

Please sign in to comment.