mirror of
https://github.com/MariaDB/server.git
synced 2025-11-21 13:09:40 +01:00
3d6eb7afcf
This fixed the MySQL bug# 20338 about misuse of double underscore prefix __WIN__, which was old MySQL's idea of identifying Windows Replace it by _WIN32 standard symbol for targeting Windows OS (both 32 and 64 bit) Not that connect storage engine is not fixed in this patch (must be fixed in "upstream" branch)
67 lines
894 B
C++
67 lines
894 B
C++
|
|
// vim:sw=2:ai
|
|
|
|
/*
|
|
* Copyright (C) 2010-2011 DeNA Co.,Ltd.. All rights reserved.
|
|
* See COPYRIGHT.txt for details.
|
|
*/
|
|
|
|
#ifndef DENA_AUTO_FILE_HPP
|
|
#define DENA_AUTO_FILE_HPP
|
|
|
|
/*
|
|
#ifndef _WIN32
|
|
#include <dirent.h>
|
|
#endif
|
|
*/
|
|
|
|
#include "util.hpp"
|
|
|
|
namespace dena {
|
|
|
|
struct auto_file : private noncopyable {
|
|
auto_file() : fd(-1) { }
|
|
~auto_file() {
|
|
reset();
|
|
}
|
|
int get() const { return fd; }
|
|
int close() {
|
|
if (fd < 0) {
|
|
return 0;
|
|
}
|
|
const int r = ::close(fd);
|
|
fd = -1;
|
|
return r;
|
|
}
|
|
void reset(int x = -1) {
|
|
if (fd >= 0) {
|
|
this->close();
|
|
}
|
|
fd = x;
|
|
}
|
|
private:
|
|
int fd;
|
|
};
|
|
|
|
/*
|
|
struct auto_dir : private noncopyable {
|
|
auto_dir() : dp(0) { }
|
|
~auto_dir() {
|
|
reset();
|
|
}
|
|
DIR *get() const { return dp; }
|
|
void reset(DIR *d = 0) {
|
|
if (dp != 0) {
|
|
closedir(dp);
|
|
}
|
|
dp = d;
|
|
}
|
|
private:
|
|
DIR *dp;
|
|
};
|
|
*/
|
|
|
|
};
|
|
|
|
#endif
|
|
|