mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Change all preprocessor compiler directives to use __WIN__ as the mean of
specifying Windows or not Windows compile. This is what MariaDB does. modified: storage/connect/array.cpp modified: storage/connect/blkfil.cpp modified: storage/connect/block.h modified: storage/connect/colblk.cpp modified: storage/connect/domdoc.cpp modified: storage/connect/filamap.cpp modified: storage/connect/filamdbf.cpp modified: storage/connect/filamfix.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamvct.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.cpp modified: storage/connect/filter.h modified: storage/connect/fmdlex.c modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/json.cpp modified: storage/connect/macutil.cpp modified: storage/connect/macutil.h modified: storage/connect/maputil.cpp modified: storage/connect/mycat.cc modified: storage/connect/myconn.cpp modified: storage/connect/myconn.h modified: storage/connect/myutil.cpp modified: storage/connect/odbconn.cpp modified: storage/connect/odbconn.h modified: storage/connect/os.h modified: storage/connect/osutil.c modified: storage/connect/plgdbsem.h modified: storage/connect/plgdbutl.cpp modified: storage/connect/plugutil.c modified: storage/connect/rcmsg.c modified: storage/connect/reldef.cpp modified: storage/connect/reldef.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabmac.cpp modified: storage/connect/tabmac.h modified: storage/connect/tabmul.cpp modified: storage/connect/tabmul.h modified: storage/connect/tabmysql.cpp modified: storage/connect/taboccur.cpp modified: storage/connect/tabodbc.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabsys.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabutil.cpp modified: storage/connect/tabvct.cpp modified: storage/connect/tabwmi.cpp modified: storage/connect/tabxcl.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/valblk.cpp modified: storage/connect/value.cpp modified: storage/connect/xindex.cpp modified: storage/connect/xindex.h
This commit is contained in:
@@ -15,12 +15,12 @@
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#if defined(WIN32)
|
||||
#if defined(__WIN__)
|
||||
#include <io.h>
|
||||
#include <winsock2.h>
|
||||
//#include <windows.h>
|
||||
#include <comdef.h>
|
||||
#else // !WIN32
|
||||
#else // !__WIN__
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
@@ -28,7 +28,7 @@
|
||||
//#include <ctype.h>
|
||||
#include "osutil.h"
|
||||
#define _O_RDONLY O_RDONLY
|
||||
#endif // !WIN32
|
||||
#endif // !__WIN__
|
||||
#include "resource.h" // for IDS_COLUMNS
|
||||
|
||||
#define INCLUDE_TDBXML
|
||||
@@ -53,11 +53,11 @@
|
||||
|
||||
extern "C" char version[];
|
||||
|
||||
#if defined(WIN32) && defined(DOMDOC_SUPPORT)
|
||||
#if defined(__WIN__) && defined(DOMDOC_SUPPORT)
|
||||
#define XMLSUP "MS-DOM"
|
||||
#else // !WIN32
|
||||
#else // !__WIN__
|
||||
#define XMLSUP "libxml2"
|
||||
#endif // !WIN32
|
||||
#endif // !__WIN__
|
||||
|
||||
#define TYPE_UNKNOWN 12 /* Must be greater than other types */
|
||||
|
||||
@@ -155,11 +155,11 @@ PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info)
|
||||
tdp->Tabname = tab;
|
||||
|
||||
if (!(op = GetStringTableOption(g, topt, "Xmlsup", NULL)))
|
||||
#if defined(WIN32)
|
||||
#if defined(__WIN__)
|
||||
tdp->Usedom = true;
|
||||
#else // !WIN32
|
||||
#else // !__WIN__
|
||||
tdp->Usedom = false;
|
||||
#endif // !WIN32
|
||||
#endif // !__WIN__
|
||||
else
|
||||
tdp->Usedom = (toupper(*op) == 'M' || toupper(*op) == 'D');
|
||||
|
||||
@@ -494,11 +494,11 @@ bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
|
||||
// Note that if no support is specified, the default is MS-DOM
|
||||
// on Windows and libxml2 otherwise
|
||||
if (*buf == '*')
|
||||
#if defined(WIN32)
|
||||
#if defined(__WIN__)
|
||||
Usedom = true;
|
||||
#else // !WIN32
|
||||
#else // !__WIN__
|
||||
Usedom = false;
|
||||
#endif // !WIN32
|
||||
#endif // !__WIN__
|
||||
else
|
||||
Usedom = (toupper(*buf) == 'M' || toupper(*buf) == 'D');
|
||||
|
||||
@@ -878,7 +878,7 @@ bool TDBXML::Initialize(PGLOBAL g)
|
||||
Nlist = TabNode->GetChildElements(g);
|
||||
|
||||
Docp->SetNofree(true); // For libxml2
|
||||
#if defined(WIN32)
|
||||
#if defined(__WIN__)
|
||||
} catch(_com_error e) {
|
||||
// We come here if a DOM command threw an error
|
||||
char buf[128];
|
||||
@@ -892,7 +892,7 @@ bool TDBXML::Initialize(PGLOBAL g)
|
||||
sprintf(g->Message, "%s hr=%p", MSG(COM_ERROR), e.Error());
|
||||
|
||||
goto error;
|
||||
#endif // WIN32
|
||||
#endif // __WIN__
|
||||
#if !defined(UNIX)
|
||||
} catch(...) {
|
||||
// Other errors
|
||||
|
Reference in New Issue
Block a user