Changeset 10 in libcf

Timestamp:

01/30/13 23:40:33 (11 years ago)

Author:

cheese

Message:

#1 arrange some code and change windows project name from lower case to upper case

Location:

trunk

Files:

• include/cf_base.h (modified) (2 diffs)
• include/cf_debug.h (modified) (2 diffs)
• src/cf_debug.c (modified) (2 diffs)
• src/makefile (modified) (2 diffs)
• windows/libcf (moved) (moved from trunk/windows/libCF )
• windows/libcf.ln (moved) (moved from trunk/windows/libCF.sln ) (1 diff)
• windows/libcf/libCF.vcproj (deleted)
• windows/libcf/libcf.vcproj (copied) (copied from trunk/windows/libCF/libCF.vcproj )

trunk/include/cf_base.h

@@ -13 +13 @@
 #define CF_ERROR                        -1
 
+#define NAME_LENGTH                     128
+
 #define CF_ERROR_BASE                   CF_ERROR * 1000
 
@@ -20 +22 @@
 #define CF_ERROR_MUTEX                  CF_ERROR_BASE * 5
 #define CF_ERROR_DEBUG                  CF_ERROR_BASE * 6
+#define CF_ERROR_LOG                    CF_ERROR_BASE * 7
 
 #ifdef _WIN32

trunk/include/cf_debug.h

@@ -31 +31 @@
 # define CF_DEBUG_CALLSTACK_POP()
 #endif // #ifdef _DEBUG
-
-#define NAME_LENGTH 128
 
 typedef void *  CF_Debug_Ctx;
@@ -74 +72 @@
                          CF_Debug_CallStack * callstack);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // #ifndef __CF_DEBUG_H__

trunk/src/cf_debug.c

@@ -22 +22 @@
     if (__ctx == NULL)                      \
         return CF_ERROR_DEBUG_INVALID_CTX
+
 #define GET_CTX_OSTREAM(__ctx)              \
     ((((CF_DEBUG_CTX *)__ctx)->fp == NULL)  \
@@ -37 +38 @@
 
 /* implementation of CF_Debug_Ctx */
-typedef struct __cf_debug_context__
+typedef struct __cf_debug_ctx__
 {
     char    file[NAME_LENGTH + 1];

trunk/src/makefile

@@ -41 +41 @@
                     cf_thread       \
                     cf_debug        \
+                    cf_log          \
 
-LIB_NAME        = CF
+LIB_NAME        = cf
 
 CC              = gcc
@@ -89 +90 @@
 dummy:
 
-# test
-test: all
-    $(CXX) $(CXXFLAGS) $(INCLUDES) $(CXXDEFS) -o $(OBJ_PATH)/main.o -c main.cpp
-    $(LD) $(LDFLAGS) -o $(TARGET_PATH)/cf.ex $(OBJ_PATH)/main.o -L$(TARGET_PATH) -lpthread
-    LD_LIBRARY_PATH=$(TARGET_PATH) $(TARGET_PATH)/cf.ex
-

trunk/windows/libcf.ln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCF", "libCF/libCF.vcproj", "{E5FB2D95-3841-464C-B23F-94ADA4499FE6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcf", "libcf/libcf.vcproj", "{E5FB2D95-3841-464C-B23F-94ADA4499FE6}"
 EndProject
 Global