Minor fixes to header files

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/include/lttng-kernel.h b/include/lttng-kernel.h
index 95f003f2df2391423dff548e6bc90f3ce25c41e0..394962054877f751a653050013a7b448e64a70b1 100644 (file)
--- a/include/lttng-kernel.h
+++ b/include/lttng-kernel.h
@@ -21,7 +21,9 @@
 #ifndef _LTTNG_KERNEL_H
 #define _LTTNG_KERNEL_H
 
 #ifndef _LTTNG_KERNEL_H
 #define _LTTNG_KERNEL_H
 

-#include "lttng-share.h"
+#include <stdint.h>
+
+#include <lttng-share.h>

 
 #define LTTNG_SYM_NAME_LEN  128
 
 
 #define LTTNG_SYM_NAME_LEN  128
 


@@ -55,7 +57,7 @@ enum lttng_kernel_context_type {
 struct lttng_kernel_perf_counter_ctx {
        uint32_t type;
        uint64_t config;
 struct lttng_kernel_perf_counter_ctx {
        uint32_t type;
        uint64_t config;

-       char name[LTTNG_SYMBOL_NAME_LEN];
+       char name[LTTNG_SYM_NAME_LEN];

 };
 
 /* Event/Channel context */
 };
 
 /* Event/Channel context */

diff --git a/include/lttng-share.h b/include/lttng-share.h
index 4e079d241f5392d05aee65acdfe5ca3375fd0b07..5154b90a559c33e1c07dbecc90c0e02041ba4bf2 100644 (file)
--- a/include/lttng-share.h
+++ b/include/lttng-share.h
@@ -1,24 +1,26 @@
 /*
 /*

- * Copyright (C) - 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

  *
  *

- * This program 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; only version 2
- * of the License.
+ * This program 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; only version 2 of the License.

  *
  *

- * This program 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.
+ * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA  02111-1307, USA.

  */
 
 #ifndef _LTTNG_SHARE_H
 #define _LTTNG_SHARE_H
 
  */
 
 #ifndef _LTTNG_SHARE_H
 #define _LTTNG_SHARE_H
 

+#include <stdlib.h>
+

 /* Default channel attributes */
 #define DEFAULT_CHANNEL_NAME            "channel0"
 #define DEFAULT_CHANNEL_OVERWRITE       0       /* usec */
 /* Default channel attributes */
 #define DEFAULT_CHANNEL_NAME            "channel0"
 #define DEFAULT_CHANNEL_OVERWRITE       0       /* usec */


@@ -58,9 +60,9 @@
  *    #define GET_SIZE(x) x->size;
  *
  * This is mostly use for the compatibility layer of lttng-tools. See
  *    #define GET_SIZE(x) x->size;
  *
  * This is mostly use for the compatibility layer of lttng-tools. See

- * poll/epoll for a good real example. Since x can be on the stack or allocated
+ * poll/epoll for a good example. Since x can be on the stack or allocated

  * memory using malloc(), we must use generic accessors for compat in order to
  * memory using malloc(), we must use generic accessors for compat in order to

- * *not* use a function to access members.
+ * *not* use a function to access members and not the variable name.

  */
 #define LTTNG_REF(x) ((typeof(*x) *)(x))
 
  */
 #define LTTNG_REF(x) ((typeof(*x) *)(x))
 


@@ -69,4 +71,9 @@
  */
 #define zmalloc(x) calloc(1, x)
 
  */
 #define zmalloc(x) calloc(1, x)
 

+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(array)   (sizeof(array) / (sizeof((array)[0])))
+#endif
+
+

 #endif /* _LTTNG_SHARE_H */
 #endif /* _LTTNG_SHARE_H */