Skip to content

Commit

Permalink
* rename src/deps/config.h to src/isdk_config.h
Browse files Browse the repository at this point in the history
  • Loading branch information
snowyu committed Mar 11, 2013
1 parent 138c7fa commit 9bc93c8
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ int main(int argc, char * argv[]) {
}
" _ANONYMOUS_STRUCT)

#configure_file(src/deps/config.h.in config.h)
#configure_file(src/isdk_config.h.in config.h)
configure_file (
"${PROJECT_SOURCE_DIR}/src/deps/config.h.in"
"${PROJECT_SOURCE_DIR}/src/deps/config.h"
"${PROJECT_SOURCE_DIR}/src/isdk_config.h.in"
"${PROJECT_SOURCE_DIR}/src/isdk_config.h"
)

#message("INCLUDE_DIRECTORIES:${PROJECT_SOURCE_DIR}/src")
Expand Down
2 changes: 1 addition & 1 deletion src/benchmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Interestingly, the C++ runtime libstdc++ requres libm, so if you compile a C++ p
//gcc --std=gnu99 -I. -Ideps -o benchmark benchmark.c idb_helpers.c isdk_xattr.c isdk_utils.c isdk_math.c isdk_string.c deps/sds.c deps/zmalloc.c deps/utf8proc.c -lm


#include "deps/config.h"
#include "isdk_config.h"
#include <stdlib.h>
#include <math.h>
#include <errno.h>
Expand Down
2 changes: 1 addition & 1 deletion src/deps/darray.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "isdk_config.h"

/*
* SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion src/deps/zmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void zlibc_free(void *ptr) {

#include <string.h>
#include <pthread.h>
#include "config.h"
#include "isdk_config.h"
#include "zmalloc.h"

#ifdef HAVE_MALLOC_SIZE
Expand Down
2 changes: 1 addition & 1 deletion src/idb.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef idb__h
#define idb__h

#include "deps/config.h"
#include "isdk_config.h"
#include <stdbool.h>
#include <stdio.h>
#include <stdarg.h>
Expand Down
2 changes: 1 addition & 1 deletion src/idb_helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

//iDB helpers functions...

#include "deps/config.h"
#include "isdk_config.h"
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> //symlink, unlink
Expand Down
8 changes: 4 additions & 4 deletions src/deps/config.h → src/isdk_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef _ISDK_CONFIG_H
#define __ISDK_CONFIG_H

#define HAVE_UNISTD_H
#define GNUC
Expand All @@ -41,8 +41,8 @@
// #include <sys/types.h>
// #include <sys/stat.h>
//#endif
#include "sysstat.h" /* mode_t for Windows - <sys/types.h> for POSIX */
#include "kbit.h"
#include "deps/sysstat.h" /* mode_t for Windows - <sys/types.h> for POSIX */
#include "deps/kbit.h"

#ifdef HAVE_STRUCT_DIRENT_D_NAMLEN
#define DIR_NAME_LEN(aDirent) (aDirent->d_namlen)
Expand Down
8 changes: 4 additions & 4 deletions src/deps/config.h.in → src/isdk_config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef _ISDK_CONFIG_H
#define __ISDK_CONFIG_H

#cmakedefine HAVE_UNISTD_H
#cmakedefine GNUC
Expand All @@ -41,8 +41,8 @@
// #include <sys/types.h>
// #include <sys/stat.h>
//#endif
#include "sysstat.h" /* mode_t for Windows - <sys/types.h> for POSIX */
#include "kbit.h"
#include "deps/sysstat.h" /* mode_t for Windows - <sys/types.h> for POSIX */
#include "deps/kbit.h"

#ifdef HAVE_STRUCT_DIRENT_D_NAMLEN
#define DIR_NAME_LEN(aDirent) (aDirent->d_namlen)
Expand Down
2 changes: 1 addition & 1 deletion src/isdk_math.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* =====================================================================================
*/

#include "deps/config.h"
#include "isdk_config.h"
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
Expand Down
2 changes: 1 addition & 1 deletion src/isdk_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
THE SOFTWARE.
*/

#include "deps/config.h"
#include "isdk_config.h"
//utility functions...
#if __STDC_VERSION__ >= 199901L
#define _XOPEN_SOURCE 600
Expand Down
2 changes: 1 addition & 1 deletion src/isdk_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#ifndef isdk_utils__h
#define isdk_utils__h
#include "deps/config.h"
#include "isdk_config.h"
#include <stdbool.h>
#include <stdio.h>
#include <stdarg.h>
Expand Down
2 changes: 1 addition & 1 deletion src/isdk_xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

//xattr functions...

#include "deps/config.h"
#include "isdk_config.h"
#include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
Expand Down

0 comments on commit 9bc93c8

Please sign in to comment.