resolve merge conflict
This commit is contained in:
parent
feb505e932
commit
53fd5518dc
1
buffer.h
1
buffer.h
|
@ -27,6 +27,7 @@
|
||||||
#else
|
#else
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <limits.h> /* implementation-defined data type ranges and limits */
|
#include <limits.h> /* implementation-defined data type ranges and limits */
|
||||||
|
|
||||||
/* constant definitions */
|
/* constant definitions */
|
||||||
|
|
Loading…
Reference in New Issue