Merge branch 'master' into new-api

1 files changed, 0 insertions, 33 deletions

diff --git a/testing/toxic/configdir.h b/testing/toxic/configdir.h
deleted file mode 100644
index e886e53a..00000000
--- a/testing/toxic/configdir.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Copyright (C) 2013 Tox project All Rights Reserved.
- *
- *  This file is part of Tox.
- *
- *  Tox is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Tox is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifdef _win32
-#define CONFIGDIR "\\tox\\"
-#else
-#define CONFIGDIR "/tox/"
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
-#endif
-
-char *get_user_config_dir(void);
-
-int create_user_config_dir(char *path);