Mercurial > code

changeset 99:d534fdcbb319

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove #ifdef __cplusplus
author David Demelier <markand@malikania.fr>
date Fri, 13 Jan 2012 22:48:08 +0100
parents b1a084c030c8
children 85ddc81848bd
files array.c array.h buffer.h pack.h parray.c
diffstat 5 files changed, 4 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/array.c	Fri Jan 13 19:43:02 2012 +0100
+++ b/array.c	Fri Jan 13 22:48:08 2012 +0100
@@ -73,7 +73,8 @@
 			arr->realloc = va_arg(ap, void *(*)(void *, size_t));
 			break;
 		case 't':
-			arr->type = va_arg(ap, enum array_type);
+			arr->type = va_arg(ap, int);
+			break;
 		default:
 			break;
 		}
--- a/array.h	Fri Jan 13 19:43:02 2012 +0100
+++ b/array.h	Fri Jan 13 22:48:08 2012 +0100
@@ -19,10 +19,6 @@
 #ifndef _ARRAY_H_
 #define _ARRAY_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdarg.h>
 
 #ifndef ARRAY_DEFAULT_BSIZE
@@ -84,8 +80,4 @@
 #define ARRAY_FULL(a)								\
 	((a)->length == (a)->bsize)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _ARRAY_H_ */
--- a/buffer.h	Fri Jan 13 19:43:02 2012 +0100
+++ b/buffer.h	Fri Jan 13 22:48:08 2012 +0100
@@ -21,10 +21,6 @@
 
 #include <stdarg.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define	BUFFER_DEFAULT_BSIZE	512
 
 enum buffer_type {
@@ -51,8 +47,4 @@
 void		buffer_clear(struct buffer *);
 void		buffer_free(struct buffer *);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _BUFFER_H_ */
--- a/pack.h	Fri Jan 13 19:43:02 2012 +0100
+++ b/pack.h	Fri Jan 13 22:48:08 2012 +0100
@@ -21,10 +21,6 @@
 
 #include <stdarg.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Endian detection based on SDL_endian.h
  */
@@ -66,8 +62,4 @@
 int	pack_fread(int, FILE *, const char *, ...);
 int	pack_vfread(int, FILE *, const char *, va_list);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _PACK_H_ */
--- a/parray.c	Fri Jan 13 19:43:02 2012 +0100
+++ b/parray.c	Fri Jan 13 22:48:08 2012 +0100
@@ -71,7 +71,8 @@
 			arr->realloc = va_arg(ap, void *(*)(void *, size_t));
 			break;
 		case 't':
-			arr->type = va_arg(ap, enum parray_type);
+			arr->type = va_arg(ap, int);
+			break;
 		default:
 			break;
 		}