Browse Source

extract common macros

Anton Lebedevich 13 years ago
parent
commit
f785ef77aa

+ 2 - 0
include/pgsql_binary.hrl

@@ -0,0 +1,2 @@
+-define(int16, 1/big-signed-unit:16).
+-define(int32, 1/big-signed-unit:32).

+ 2 - 1
src/pgsql_binary.erl

@@ -4,7 +4,8 @@
 
 
 -export([encode/2, decode/2, supports/1]).
 -export([encode/2, decode/2, supports/1]).
 
 
--define(int32, 1/big-signed-unit:32).
+-include("pgsql_binary.hrl").
+
 -define(datetime, (get(datetime_mod))).
 -define(datetime, (get(datetime_mod))).
 
 
 encode(_Any, null)                          -> <<-1:?int32>>;
 encode(_Any, null)                          -> <<-1:?int32>>;

+ 1 - 3
src/pgsql_connection.erl

@@ -18,6 +18,7 @@
 -export([aborted/3]).
 -export([aborted/3]).
 
 
 -include("pgsql.hrl").
 -include("pgsql.hrl").
+-include("pgsql_binary.hrl").
 
 
 -record(state, {
 -record(state, {
           reader,
           reader,
@@ -31,9 +32,6 @@
           statement,
           statement,
           txstatus}).
           txstatus}).
 
 
--define(int16, 1/big-signed-unit:16).
--define(int32, 1/big-signed-unit:32).
-
 %% -- client interface --
 %% -- client interface --
 
 
 start_link() ->
 start_link() ->

+ 1 - 1
src/pgsql_fdatetime.erl

@@ -4,7 +4,7 @@
 
 
 -export([decode/2, encode/2]).
 -export([decode/2, encode/2]).
 
 
--define(int32, 1/big-signed-unit:32).
+-include("pgsql_binary.hrl").
 
 
 -define(postgres_epoc_jdate, 2451545).
 -define(postgres_epoc_jdate, 2451545).
 
 

+ 1 - 2
src/pgsql_idatetime.erl

@@ -4,8 +4,7 @@
 
 
 -export([decode/2, encode/2]).
 -export([decode/2, encode/2]).
 
 
--define(int32, 1/big-signed-unit:32).
--define(int64, 1/big-signed-unit:64).
+-include("pgsql_binary.hrl").
 
 
 -define(postgres_epoc_jdate, 2451545).
 -define(postgres_epoc_jdate, 2451545).
 
 

+ 1 - 3
src/pgsql_sock.erl

@@ -11,12 +11,10 @@
 -export([init/1, code_change/3, terminate/2]).
 -export([init/1, code_change/3, terminate/2]).
 
 
 -include("pgsql.hrl").
 -include("pgsql.hrl").
+-include("pgsql_binary.hrl").
 
 
 -record(state, {c, mod, sock, tail}).
 -record(state, {c, mod, sock, tail}).
 
 
--define(int16, 1/big-signed-unit:16).
--define(int32, 1/big-signed-unit:32).
-
 %% -- client interface --
 %% -- client interface --
 
 
 start_link(C, Host, Username, Opts) ->
 start_link(C, Host, Username, Opts) ->